Merge branch 'ft-dev' into 'main'

fix：修改设备配置编辑问题，修改场景联动点击编辑回显设备问题，修改了租户配置样式问题 See merge request huang/yun-teng-iot-front!146

Merge branch 'ft-dev' into 'main'
fix：修改设备配置编辑问题，修改场景联动点击编辑回显设备问题，修改了租户配置样式问题 See merge request huang/yun-teng-iot-front!146
xp.Huang
2 parents 15b854ff e1f24fe9
Showing 23 changed files with 313 additions and 289 deletions
src/views/device/profiles/DeviceProfileModal.vue
src/views/device/profiles/step/DeviceProfileStep2.vue
src/views/device/profiles/step/DeviceProfileStep3.vue
src/views/device/profiles/step/cpns/alarmruleconditions/config.ts
src/views/device/profiles/step/cpns/alarmruleconditions/cpns/config.ts
src/views/device/profiles/step/cpns/alarmruleconditions/index.vue
src/views/device/profiles/step/cpns/alarmseverity/config.ts
src/views/device/profiles/step/cpns/alarmseverity/index.vue
src/views/device/profiles/step/data.ts
src/views/rule/dataFlow/addDataTransferDrawer.vue
src/views/rule/dataFlow/cpns/cpns/transferConfigApi.vue
src/views/rule/dataFlow/cpns/cpns/transferConfigKafka.vue
src/views/rule/dataFlow/cpns/cpns/transferConfigMqtt.vue
src/views/rule/dataFlow/cpns/cpns/transferConfigRabbitMq.vue
src/views/rule/dataFlow/cpns/transferConfigParams.vue
src/views/rule/linkedge/addForm/doaction.vue
src/views/rule/linkedge/index.vue
src/views/rule/linkedge/useDrawer.vue
src/views/tenant/config/config.ts
src/views/tenant/config/cpns/config.ts
--- a/src/views/device/profiles/DeviceProfileModal.vue
View file @135ef43
+++ b/src/views/device/profiles/DeviceProfileModal.vue
View file @135ef43
@@ -161,9 +161,7 @@
           });
           proxy.$refs.DeviceProfileStep3Ref.clearProfileDataFunc();
           proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
-          setTimeout(() => {
-            emit('success');
-          }, 10);
+          // emit('success');
         } else if (isUpdate.value == 3) {
           postEditId.value = data.record.id;
           getBackendData = await deviceConfigGetDetail(postEditId.value);
@@ -184,9 +182,7 @@
           });
           proxy.$refs.DeviceProfileStep3Ref.clearProfileDataFunc();
           proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
-          setTimeout(() => {
-            emit('success');
-          }, 10);
+          // emit('success');
         }
       });
       function handleStepPrev() {
@@ -211,57 +207,64 @@
         current.value++;
         getStepTwoData.value = v;
         if (isUpdate.value == 1) {
-          proxy.$refs.DeviceProfileStep3Ref.initAddAlarmRuleFunc();
-          proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormCreateAlarmFunc();
+          try {
+            proxy.$refs.DeviceProfileStep3Ref.initAddAlarmRuleFunc();
+            proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormCreateAlarmFunc();
+          } catch {}
         } else if (isUpdate.value == 2) {
-          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,
-          });
-          //回显创建报警规则和清除报警规则
+          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,
+            });
+            proxy.$refs.DeviceProfileStep3Ref.setRegisterFormCreateAlarmFunc({
+              default: editData.value?.profileData.alarms[0].createRules,
+            });
+            //回显创建报警规则和清除报警规则
+          } catch {}
         } else if (isUpdate.value == 3) {
-          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,
-          });
-          //回显创建报警规则和清除报警规则
+          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 {}
         }
       }
       function handleStep3Next(v, v1) {
-        console.log(v1);
         isEditAndChange.value = v1;
         current.value++;
         getStepThreeData.value = v;
@@ -308,7 +311,6 @@
             isEditAndChange.value == true
               ? editData.value.profileData.alarms
               : getStepThreeData.value;
-          // isGetStepThreeData.profileData.alarms = getStepThreeData.value;
           postDeviceConfogData.value.id = postEditId.value;
           getStepFourData = await proxy.$refs.DeviceProfileStep4Ref.getAllFields();
           const getJoinAlarmContactIdData = getStepFourData.alarmContactId.join(',');
@@ -342,7 +344,6 @@
         }
       };
       return {
-        // isEditFunc,
         isShowRule,
         isShowOkBtnFalse,
         isStatus,
--- a/src/views/device/profiles/step/DeviceProfileStep2.vue
View file @135ef43
+++ b/src/views/device/profiles/step/DeviceProfileStep2.vue
View file @135ef43
@@ -48,6 +48,7 @@
           const values = await validate();
           emit('next', values);
         } catch (error) {
+          console.log(error);
         } finally {
         }
       }
--- a/src/views/device/profiles/step/DeviceProfileStep3.vue
View file @135ef43
+++ b/src/views/device/profiles/step/DeviceProfileStep3.vue
View file @135ef43
 <template>
   <div>
     <div class="step3" style="background-color: #f6f8f9">
+      <!-- 报警规则 -->
       <template v-for="(item, index) in profileData" :key="item.id">
         <CollapseContainer class="border mb-1" :canExpan="false">
           <!-- 移除按钮 -->
@@ -34,7 +35,7 @@
               </div>
             </div>
           </div>
-          <!-- 传递报警和报警类型 -->
+          <!-- 报警类型和传递报警 -->
           <!-- 创建报警规则 -->
           <div style="margin-top: -57px">
             <p style="margin-left: 10px; font-size: medium">创建报警规则</p>
@@ -297,7 +298,9 @@
           <!-- 清除报警规则 -->
         </CollapseContainer>
       </template>
+      <!-- 报警规则 -->
     </div>
+    <!-- 按钮 -->
     <div class="flex justify-center" style="display: fixed; bottom: 100px">
       <a-button class="mr-5" @click="prevStep">上一步</a-button>
       <a-button @click="handleFormStep3toStep4Next">下一步</a-button>
@@ -309,11 +312,12 @@
         >添加报警规则</a-button
       >
     </div>
+    <!-- 按钮 -->
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, getCurrentInstance, watch, reactive } from 'vue';
+  import { defineComponent, ref, getCurrentInstance, reactive } from 'vue';
   import type { IProfileData } from './index.t';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form';
@@ -321,7 +325,6 @@
     step3Schemas,
     step3HighSetting,
     dashboardFormScheme,
-    isWhereType,
     formChangeDetailSchema,
   } from './data';
   import { PlusCircleOutlined } from '@ant-design/icons-vue';
@@ -330,7 +333,6 @@
   import EnableRule from './cpns/enablerule/index.vue';
   import AlarmRuleConditions from './cpns/alarmruleconditions/index.vue';
   import { Button } from '/@/components/Button';
-  export const isWhereTypeValueDisabled = ref(false);
   import AlarmSeverity from './cpns/alarmseverity/index.vue';
   import DetailTemplate from './cpns/detailtemplate/index.vue';
   import { generateUUID } from '/@/hooks/web/useGenerateUUID';
@@ -367,13 +369,6 @@
       const ruleLastObj: any = ref<[]>([]);
       const enableObj: any = ref({});
       const enableClearObj: any = ref({});
-      const isWhereTypeValue = ref(null);
-      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: any = ref<IProfileData[]>([]);
@@ -413,10 +408,7 @@
         propagate: false,
         propagateRelationTypes: [''],
       });
-      //接收临时启用规则数据
-      const receiveOpenRuleTempArr = ref<[]>([]);
-      //接收临时规则条件数据
-      const receiveRuleConditionTempArr = ref<[]>([]);
+
       //创建条件总对象
       const createRulesObj: any = ref({});
       let addCreateRulesObj = reactive({
@@ -469,7 +461,6 @@
       let fliterClearTempRuleConditionTempArr = ref<[]>([]);
       let fliterClearTempOpenRuleTempArr: any = ref<[]>([]);
       const getStepThreeEditStatus: any = ref(false);
-      // const isEditDataAndValue = ref(false);
       const getStepThreeEditArr = ref<[]>([]);
       const getFilterStepThreeEditArr: any = ref<[]>([]);
       const getFilterStepThreeEditClearArr: any = ref<[]>([]);
@@ -478,16 +469,13 @@
       const detailDetailModelArray = ref<[]>([]);
       const createAlarmArray = ref<[]>([]);
       const isLostFocuxStatus = ref(true);
-      // const getEditDataAndValue = ref<[]>([]);
       const editIndex = ref(-1);
+      const allAlarmsData = ref<[]>([]);
+      let allAlarmsSingleObj = reactive({});
       setTimeout(() => {
         getIsShowAddRule = props.isShowAddRule;
       }, 10);
-
-      const log = (e) => {
-        console.log(e);
-      };
       const isAddRuleStatusFunc = (v) => {
         isAddRuleStatus.value = v;
       };
@@ -503,16 +491,7 @@
       const prevStep = () => {
         emit('prev');
       };
-      //添加报警规则
-      const addAlarmRule = () => {
-        profileData.value.push(initProfileData);
-      };
-      //初始化添加一个报警规则
-      const initAddAlarmRuleFunc = () => {
-        if (profileData.value.length === 0) {
-          profileData.value.push(initProfileData);
-        }
-      };
+
       //TODO Mobile dashboard:
       const [dashboardForm] = useForm({
         labelWidth: 120,
@@ -573,16 +552,21 @@
       const clearEditAllRegisterFormFunc = () => {
         getFilterStepThreeEditArr.value.length = 0;
         getFilterStepThreeEditArr.value = [];
+        try {
+          proxy.$refs.alarmSeverityRef.resetFieldsFunc();
+        } catch {}
       };
       //重置表单数据
       const clearAllRegisterFormFunc = () => {
-        setTimeout(() => {
-          clearAlaramTypeValueFunc();
-          clearTransmitAlarmFunc();
-          resetRegisterFormClearChangeDetailFunc();
-          resetAllTemplateFunc();
-        }, 10);
+        try {
+          setTimeout(() => {
+            clearAlaramTypeValueFunc();
+            clearTransmitAlarmFunc();
+            resetRegisterFormClearChangeDetailFunc();
+            resetAllTemplateFunc();
+          }, 5000);
+        } catch {}
       };
       //重置报警启用规则-报警规则条件
       const resetAllTemplateFunc = () => {
@@ -639,9 +623,9 @@
           }
         }
         let formatSchemeMap =
-          openSchemObj?.schedule.type == 'ANY_TIME'
+          openSchemObj?.schedule?.type == 'ANY_TIME'
             ? '始终启用'
-            : openSchemObj?.schedule.type == 'SPECIFIC_TIME'
+            : openSchemObj?.schedule?.type == 'SPECIFIC_TIME'
             ? '定时启用'
             : '自定义启用';
         return formatSchemeMap;
@@ -721,7 +705,6 @@
           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);
@@ -764,8 +747,6 @@
       };
       const emptyCreateRoleFunc = () => {
-        receiveOpenRuleTempArr.value = [];
-        receiveRuleConditionTempArr.value = [];
         addNewOpenRule.schedule = {};
         addNewRuleTem.condition.condition = {};
       };
@@ -797,7 +778,56 @@
         const val1 = validateAlaramTypeValueFunc();
         alarmTypeGet.value = val1;
       };
+      //添加报警规则
+      const addAlarmRule = () => {
+        profileData.value.push(initProfileData);
+        addAlarmRuleFunc();
+      };
+      //添加报警规则方法
+      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);
+        // const sigleAlarmTypeGetVal = [];
+        // let sigleAlarmTypeGetObj = {};
+        // sigleAlarmTypeGetVal.push(alarmTypeGet.value as never);
+        // sigleAlarmTypeGetVal.forEach((f) => {
+        //   sigleAlarmTypeGetObj = f;
+        // });
+        // allAlarmsSingleObj = {
+        //   ...sigleAlarmTypeGetObj,
+        // };
+        // allAlarmsData.value.push(allAlarmsSingleObj as never);
+        // console.log(allAlarmsData.value);
+      };
+      //初始化添加一个报警规则
+      const initAddAlarmRuleFunc = () => {
+        if (profileData.value.length === 0) {
+          profileData.value.push(initProfileData);
+        }
+      };
       // 添加创建条件方法
       const addCreateRuleFunc = async () => {
         try {
@@ -849,6 +879,7 @@
       const addCreateRole = async (index: number) => {
         profileData.value[index]?.alarms.push(initCreateRules);
         addCreateRuleFunc();
+        proxy.$refs.alarmSeverityRef.updateSchemaSelectDisableFunc();
       };
       // 删除创建条件
       const deleteCondition = (index: number, createIndex: number) => {
@@ -857,13 +888,6 @@
           getFilterStepThreeEditArr.value.pop();
         }
       };
-
-      watch(isWhereType, (nV) => {
-        isWhereTypeValue.value = nV;
-        if (isWhereTypeValue.value == nV) {
-          isWhereTypeValueDisabled.value = true;
-        }
-      });
       //报警规则
       //启用规则
       const getAllFieldsEnabFunc = (v) => {
@@ -877,33 +901,7 @@
         fliterTempRuleConditionTempArr.value.push({
           condition: addNewRuleTem.condition.condition,
         } as never);
-        // getEditDataAndValue.value.push({
-        //   condition: addNewRuleTem.condition.condition,
-        // } as never);
       };
-      //格式化编辑
-      // 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) => {
         let formatMap = v.condition.map((f) => {
@@ -974,6 +972,7 @@
           };
           getRegisterFormChangeDetailFunc();
           addCreateRuleFunc();
+          addAlarmRuleFunc();
           addClearAlaramRule();
           getAllObjTemp = {
             ...alarmTypeGet.value,
@@ -1019,12 +1018,12 @@
         getStepThreeEditStatus.value = false;
         setTimeout(() => {
           openModal3(true);
-          try {
-            setTimeout(() => {
-              proxy.$refs.getChildData3.resetDataFunc();
-            }, 10);
-          } catch (e) {
-            return e;
+          if (true) {
+            try {
+              setTimeout(() => {
+                proxy.$refs.getChildData3.resetDataFunc();
+              }, 100);
+            } catch {}
           }
         }, 10);
       };
@@ -1112,15 +1111,9 @@
         setAlaramTypeFormFunc,
         setTransmitAlarmFormFunc,
         clearAllRegisterFormFunc,
-        ruleClearTemplateData,
-        enableClearTemplateData,
-        detailClearTemplateData,
         handleOpenClearDetailTemplate,
         handleOpenClearEnableRule,
         handleOpenClearAlaramRuleConditions,
-        detailTemplateData,
-        enableTemplateData,
-        ruleTemplateData,
         dashboardForm,
         getAllClearFieldsRuleFunc,
         getAllClearFieldsEnabFunc,
@@ -1140,7 +1133,6 @@
         handleOpenAlaramRuleConditions,
         handleOpenDetailTemplate,
         handleFormStep3toStep4Next,
-        log,
         profileData,
         deleteAlarmRule,
         prevStep,
@@ -1152,9 +1144,6 @@
         setCreateRegisterFormChangeDetailFunc,
         detailDetailModelArray,
         isLostFocuxStatus,
-        // isEditDataAndValue,
-        // getEditDataAndValue,
-        // isEditDataAndValueFunc,
         handleClickHidenEdit,
         alarmSeverityRef,
         detailTemplateRef,
--- a/src/views/device/profiles/step/cpns/alarmruleconditions/config.ts
View file @135ef43
+++ b/src/views/device/profiles/step/cpns/alarmruleconditions/config.ts
View file @135ef43
@@ -179,6 +179,7 @@ export const formSchema: FormSchema[] = [
     label: '持续时间值',
     colProps: { span: 13 },
     component: 'Input',
+    defaultValue: 0,
     componentProps: {
       maxLength: 16,
       placeholder: '请输入持续时间值（请输入数字）',
--- a/src/views/device/profiles/step/cpns/alarmruleconditions/cpns/config.ts
View file @135ef43
+++ b/src/views/device/profiles/step/cpns/alarmruleconditions/cpns/config.ts
View file @135ef43
@@ -132,7 +132,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isString(Reflect.get(values, 'type1')),
   },
   {
-    field: '',
+    field: 'no',
     label: '大小写',
     component: 'Checkbox',
     colProps: { span: 13 },
@@ -388,7 +388,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isComplex(Reflect.get(values, 'type1')),
   },
   {
-    field: '',
+    field: 'no',
     component: 'DatePicker',
     label: '请选择日期',
     colProps: {
@@ -400,7 +400,7 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: '',
+    field: 'no',
     component: 'TimePicker',
     label: '请选择时间',
     colProps: {
--- a/src/views/device/profiles/step/cpns/alarmruleconditions/index.vue
View file @135ef43
+++ b/src/views/device/profiles/step/cpns/alarmruleconditions/index.vue
View file @135ef43
@@ -6,6 +6,7 @@
       @register="register"
       :title="getTitle"
       @ok="handleSubmit"
+      @cancel="handleCancel"
     >
       <CollapseContainer title="键名筛选器" class="border mb-8">
         <div class="table-style">
@@ -166,10 +167,16 @@
         detailData.value.length = 0;
         resetFields();
       };
+
+      const handleCancel = () => {
+        resetDataFunc();
+      };
       const handleAddKey = () => {
-        openModal(true, {
-          isUpdate: false,
-        });
+        setTimeout(() => {
+          openModal(true, {
+            isUpdate: false,
+          });
+        }, 30);
       };
       const handleEdit = (record: Recordable) => {
         openModal(true, {
@@ -198,6 +205,7 @@
         reload();
       };
       return {
+        handleCancel,
         schema,
         detailData,
         getTableApiData,
--- a/src/views/device/profiles/step/cpns/alarmseverity/config.ts
View file @135ef43
+++ b/src/views/device/profiles/step/cpns/alarmseverity/config.ts
View file @135ef43
-import { FormSchema } from '/@/components/Table';
-import { ref } from 'vue';
-export const isWhereType = ref(null);
+import { FormSchema } from '/@/components/Form';
 export const formSchema: FormSchema[] = [
   {
@@ -12,6 +10,7 @@ export const formSchema: FormSchema[] = [
     },
     componentProps() {
       return {
+        placeholder: '请选择报警严重程度',
         options: [
           {
             value: 'CRITICAL',
@@ -34,9 +33,6 @@ export const formSchema: FormSchema[] = [
             label: '不确定',
           },
         ],
-        onChange: (v) => {
-          isWhereType.value = v ? v : 'CRITICAL';
-        },
       };
     },
   },
--- a/src/views/device/profiles/step/cpns/alarmseverity/index.vue
View file @135ef43
+++ b/src/views/device/profiles/step/cpns/alarmseverity/index.vue
View file @135ef43
@@ -17,15 +17,62 @@
     emits: ['success', 'register', 'getAllFields'],
     setup(props) {
       const fieldValue: any = ref({});
-      const [registerForm, { getFieldsValue, setFieldsValue }] = useForm({
-        labelWidth: 120,
-        schemas: formSchema,
-      });
+      const [registerForm, { resetFields, getFieldsValue, setFieldsValue, updateSchema }] = useForm(
+        {
+          labelWidth: 120,
+          schemas: formSchema,
+        }
+      );
+      const resetFieldsFunc = () => {
+        resetFields();
+      };
       const getFieldsValueFunc = () => {
         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) => {
+              if (f.value == formModel.default) {
+                f.disabled = true;
+              }
+            });
+            return {
+              options: item,
+            };
+          },
+        });
+      };
       const setFieldsValueFunc = () => {
         if (props.alarmSeverityInfo != 1) {
@@ -39,6 +86,8 @@
       };
       setFieldsValueFunc();
       return {
+        resetFieldsFunc,
+        updateSchemaSelectDisableFunc,
         getFieldsValueFunc,
         registerForm,
       };
--- a/src/views/device/profiles/step/data.ts
View file @135ef43
+++ b/src/views/device/profiles/step/data.ts
View file @135ef43
 import { FormSchema } from '/@/components/Form';
 import { deviceConfigGetRuleChain } from '/@/api/device/deviceConfigApi';
-import { ref } from 'vue';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { alarmContactGetPage } from '/@/api/device/deviceConfigApi';
@@ -145,59 +144,6 @@ export const step3HighSetting: FormSchema[] = [
   },
 ];
-export const isWhereType = ref(null);
-
-export const step3CreateAlarm: FormSchema[] = [
-  {
-    field: 'default',
-    component: 'Select',
-    label: '报警严重程度：',
-    colProps: {
-      span: 17,
-    },
-    componentProps() {
-      return {
-        options: [
-          {
-            value: 'CRITICAL',
-            label: '危险',
-          },
-          {
-            value: 'MAJOR',
-            label: '重要',
-          },
-          {
-            value: 'MINOR',
-            label: '次要',
-          },
-          {
-            value: 'WARNING',
-            label: '警告',
-          },
-          {
-            value: 'INDETERMINATE',
-            label: '不确定',
-          },
-        ],
-        onChange: (v) => {
-          isWhereType.value = v ? v : 'INDETERMINATE';
-        },
-      };
-    },
-  },
-];
-
-export const step3ClearAlarm: FormSchema[] = [
-  // {
-  //   field: 'associationType',
-  //   component: 'Input',
-  //   label: '关联类型',
-  //   componentProps: {
-  //     placeholder: '要传递的关联类型',
-  //   },
-  // },
-];
-
 export const dashboardFormScheme: FormSchema[] = [
   {
     field: 'dashboardId',
--- a/src/views/rule/dataFlow/addDataTransferDrawer.vue
View file @135ef43
+++ b/src/views/rule/dataFlow/addDataTransferDrawer.vue
View file @135ef43
@@ -50,7 +50,7 @@
     emits: ['success', 'register'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
-      const { proxy } = getCurrentInstance();
+      const { proxy } = getCurrentInstance() as any;
       const allPostForm = reactive({});
       const getNameObj = reactive({
         name: '',
--- a/src/views/rule/dataFlow/cpns/cpns/transferConfigApi.vue
View file @135ef43
+++ b/src/views/rule/dataFlow/cpns/cpns/transferConfigApi.vue
View file @135ef43
@@ -157,7 +157,7 @@
         key: '',
         value: '',
       });
-      const sonValues = reactive({
+      const sonValues: any = reactive({
         configuration: {},
       });
       const [register, { validate, setFieldsValue, resetFields: defineClearFunc }] = useForm({
@@ -239,7 +239,7 @@
         credentialsV.credentials.type = sonValues.configuration.type;
         const kong = {};
         let kongTemp = {};
-        keyAndValueArrTemp.value.map((item) => {
+        keyAndValueArrTemp.value.map((item: any) => {
           kong[item.key] = item.value;
         });
         kongTemp = JSON.parse(JSON.stringify(kong));
--- a/src/views/rule/dataFlow/cpns/cpns/transferConfigKafka.vue
View file @135ef43
+++ b/src/views/rule/dataFlow/cpns/cpns/transferConfigKafka.vue
View file @135ef43
@@ -192,7 +192,7 @@
           }
           const kong = {};
           let kongTemp = {};
-          keyAndValueArrTemp.value.map((item) => {
+          keyAndValueArrTemp.value.map((item: any) => {
             kong[item.key] = item.value;
           });
           kongTemp = JSON.parse(JSON.stringify(kong));
--- a/src/views/rule/dataFlow/cpns/cpns/transferConfigMqtt.vue
View file @135ef43
+++ b/src/views/rule/dataFlow/cpns/cpns/transferConfigMqtt.vue
View file @135ef43
@@ -88,7 +88,7 @@
           type: '',
         },
       });
-      const sonValues = reactive({
+      const sonValues: any = reactive({
         configuration: {},
       });
       const [register, { validate, setFieldsValue, resetFields: defineClearFunc }] = useForm({
--- a/src/views/rule/dataFlow/cpns/cpns/transferConfigRabbitMq.vue
View file @135ef43
+++ b/src/views/rule/dataFlow/cpns/cpns/transferConfigRabbitMq.vue
View file @135ef43
@@ -142,12 +142,6 @@
       const tempGetKeyAndVal = async () => {
         temp.value = await validateKeyAndValue();
       };
-      // const defaultAddKeyAndValueFunc = () => {
-      //   if (keyAndValueArr.value.length == 0) {
-      //     keyAndValueArr.value.push(keyAndValueObj as never);
-      //   }
-      // };
-      // defaultAddKeyAndValueFunc();
       const getDefaultValue = async () => {
         await tempGetKeyAndVal();
@@ -170,7 +164,7 @@
         }
         const kong = {};
         let kongTemp = {};
-        keyAndValueArrTemp.value.map((item) => {
+        keyAndValueArrTemp.value.map((item: any) => {
           kong[item.key] = item.value;
         });
         kongTemp = JSON.parse(JSON.stringify(kong));
--- a/src/views/rule/dataFlow/cpns/transferConfigParams.vue
View file @135ef43
+++ b/src/views/rule/dataFlow/cpns/transferConfigParams.vue
View file @135ef43
@@ -39,7 +39,7 @@
     props: ['getModeSelect', 'defineClearFuncProp'],
     emits: ['prevSon'],
     setup(props, { emit }) {
-      const { proxy } = getCurrentInstance();
+      const { proxy } = getCurrentInstance() as any;
       const getTransferConfigKafkaValue = ref({});
       const refTransferConfigKafka = ref(null);
       const refTransferConfigMqtt = ref(null);
--- a/src/views/rule/linkedge/addForm/doaction.vue
View file @135ef43
+++ b/src/views/rule/linkedge/addForm/doaction.vue
View file @135ef43
@@ -53,7 +53,7 @@
         if (props.editActionFather !== 1) {
           setTimeout(() => {
             setFieldsValue(props.editActionFather);
-          }, 100);
+          }, 10);
         }
       };
       setFieldsFormValueFun();
@@ -66,7 +66,7 @@
                 options: props.newActionMapFather,
               },
             });
-          }, 100);
+          }, 10);
         }
       };
       editSelectDevice();
--- a/src/views/rule/linkedge/index.vue
View file @135ef43
+++ b/src/views/rule/linkedge/index.vue
View file @135ef43
@@ -6,7 +6,11 @@
       :rowSelection="{ type: 'checkbox' }"
     >
       <template #toolbar>
-        <a-button v-if="isSysadmin || isCustomer || isPlatform" type="primary" @click="handleAdd">
+        <a-button
+          v-if="isTenant || isSysadmin || isCustomer || isPlatform"
+          type="primary"
+          @click="handleAdd"
+        >
           新增场景联动
         </a-button>
         <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete">
--- a/src/views/rule/linkedge/useDrawer.vue
View file @135ef43
+++ b/src/views/rule/linkedge/useDrawer.vue
View file @135ef43
@@ -292,12 +292,12 @@
             optionsItemArray.value.length = 0;
             try {
               setTimeout(() => {
-                proxy.$refs.refTriggerChild.resetFieldsValueFunc();
-                proxy.$refs.refTriggerChild.clearSelectDevice();
-                proxy.$refs.refConditionChild.resetFieldsValueFunc();
-                proxy.$refs.refConditionChild.clearSelectDevice();
-                proxy.$refs.refActionChild.resetFieldsValueFunc();
-                proxy.$refs.refActionChild.clearSelectDevice();
+                proxy.$refs.refTriggerChild?.resetFieldsValueFunc();
+                proxy.$refs.refTriggerChild?.clearSelectDevice();
+                proxy.$refs.refConditionChild?.resetFieldsValueFunc();
+                proxy.$refs.refConditionChild?.clearSelectDevice();
+                proxy.$refs.refActionChild?.resetFieldsValueFunc();
+                proxy.$refs.refActionChild?.clearSelectDevice();
                 clearActionsAllDevice();
                 resetActionsAllArrayFunc();
               }, 10);
@@ -309,6 +309,7 @@
           }
         } else {
           try {
+            emit('success');
             kongTriggerObj = {};
             kongConditionObj = {};
             kongActionObj = {};
@@ -371,7 +372,18 @@
                 }
               });
             });
-            emit('success');
+
+            options.items.forEach((v) => {
+              return (v.value = v.tbDeviceId), (v.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;
+            }
           } catch (e) {
             return e;
           }
@@ -619,6 +631,8 @@
           getAllFormData.id = getId.value;
           getAllFormData.tenantId = getTenantId.value;
           refTriggerChildData = {};
+          refConditionChildData = {};
+          refActionChildData = {};
           pushEditArray.value.length = 0;
           pushEditConditionArray.value.length = 0;
           pushEditActionArray.value.length = 0;
--- a/src/views/tenant/config/config.ts
View file @135ef43
+++ b/src/views/tenant/config/config.ts
View file @135ef43
@@ -35,7 +35,7 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'textSearch',
     label: '租户配置名称',
-    colProps: { span: 8 },
+    colProps: { span: 6 },
     component: 'Input',
     componentProps: {
       maxLength: 255,
@@ -72,7 +72,7 @@ export const formSchema: FormSchema[] = [
     component: 'Checkbox',
     renderComponentContent: () => {
       return h('span', {}, [
-        h('span', {}, '在独立的ThinngsBoard规则引擎中处理'),
+        h('span', {}, '在独立的ThingsBoard规则引擎中处理'),
         h('span', { style: { color: 'grey' } }, '（每个独立租户需要单独的微服务）'),
       ]);
     },
--- a/src/views/tenant/config/cpns/config.ts
View file @135ef43
+++ b/src/views/tenant/config/cpns/config.ts
View file @135ef43
 import { FormSchema } from '/@/components/Table';
-// import { numberRule } from '/@/utils/rules';
 export const formSchema: FormSchema[] = [
   {
@@ -19,240 +18,240 @@ export const formSchema: FormSchema[] = [
     required: true,
     label: '最大设备数（0-无限制）',
-    component: 'Input',
+    component: 'InputNumber',
+    defaultValue: '0',
     colProps: { span: 24 },
     componentProps: {
       placeholder: '请输入最大设备数（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxAssets',
     required: true,
+    defaultValue: '0',
     label: '最大资产数（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大资产（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxCustomers',
     required: true,
+    defaultValue: '0',
     label: '最大客户数（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大客户数（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxUsers',
     required: true,
+    defaultValue: '0',
     label: '最大用户数（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大用户数（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxDashboards',
     required: true,
+    defaultValue: '0',
     label: '仪表板的最大数量（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入仪表板的最大数量（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxRuleChains',
     required: true,
+    defaultValue: '0',
     label: '最大规则链数（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大规则链数（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxResourcesInBytes',
     required: true,
+    defaultValue: '0',
     label: '以字节为单位的资源文件的最大总和（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxOtaPackagesInBytes',
     required: true,
+    defaultValue: '0',
     label: 'Ota包文件大小的最大总和（字节）（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxTransportMessages',
     required: true,
+    defaultValue: '0',
     label: '最大传输消息数（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大传输消息数（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxTransportDataPoints',
     required: true,
+    defaultValue: '0',
     label: '传输数据点的最大数量（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入传输数据点的最大数量（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxREExecutions',
     required: true,
+    defaultValue: '0',
     label: '最大规则引擎数（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大规则引擎数（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxJSExecutions',
     required: true,
+    defaultValue: '0',
     label: '最大JavaScript执行数（0-不受限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大JavaScript执行数（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxDPStorageDays',
     required: true,
+    defaultValue: '0',
     label: '最大日存储数据点数（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大日存储数据点数（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'defaultStorageTtlDays',
     required: true,
+    defaultValue: '0',
     label: '默认存储 TTL 天数（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入默认存储 TTL 天数（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'alarmsTtlDays',
     required: true,
+    defaultValue: '0',
     label: 'Alams TTL days（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
-      placeholder: '请输入Alams TTL days（请输入数字）',
+      placeholder: '请输入Alarms TTL days（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'rpcTtlDays',
     required: true,
+    defaultValue: '0',
     label: 'RPC TTL days（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入RPC TTL days（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxRuleNodeExecutionsPerMessage',
     required: true,
-
+    defaultValue: '1',
     label: '每条消息的最大规则节点执行数（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入每条消息的最大规则节点执行数（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxEmails',
     required: true,
     label: '发送的最大电子邮件数（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    defaultValue: '0',
+
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入发送的最大电子邮件数（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxSms',
     required: true,
+    defaultValue: '0',
     label: '发送的最大短信数（0-无限制）',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入发送的最大短信数（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'maxCreatedAlarms',
     required: true,
+    defaultValue: '0',
     label: '创建的最大报警数 (0 - 无限制)',
     colProps: { span: 24 },
-    component: 'Input',
+    component: 'InputNumber',
     componentProps: {
       placeholder: '请输入maxCreatedAlarms（请输入数字）',
     },
-    // rules: numberRule,
   },
   {
     field: 'transportTenantMsgRateLimit',
--- a/src/views/tenant/config/cpns/index.vue
View file @135ef43
+++ b/src/views/tenant/config/cpns/index.vue
View file @135ef43
 <template>
-  <CollapseContainer title="租户配置设置">
-    <BasicForm @register="registerForm" />
-  </CollapseContainer>
+  <div class="tenant-class">
+    <CollapseContainer title="租户配置设置">
+      <BasicForm @register="registerForm" />
+    </CollapseContainer>
+  </div>
 </template>
 <script lang="ts">
   import { defineComponent, ref } from 'vue';
@@ -40,3 +42,10 @@
     },
   });
 </script>
+<style lang="less" scoped>
+  .tenant-class {
+    :deep .ant-input-number {
+      width: 34vw !important;
+    }
+  }
+</style>
--- a/src/views/tenant/config/useDrawer.vue
View file @135ef43
+++ b/src/views/tenant/config/useDrawer.vue
View file @135ef43
 <template>
-  <div>
+  <div class="drawer-class">
     <BasicDrawer
       v-bind="$attrs"
       @register="registerDrawer"
@@ -32,7 +32,7 @@
       let postAllData: any = reactive({});
       const parentSetData: any = ref(null);
       let getValuesFormData: any = reactive({});
-      const { proxy } = getCurrentInstance();
+      const { proxy } = getCurrentInstance() as any;
       const getChildData = ref(null);
       const editGetId: any = ref('');
       const [registerForm, { getFieldsValue, resetFields, setFieldsValue }] = useForm({
@@ -115,3 +115,15 @@
     },
   });
 </script>
+
+<style lang="less">
+  .drawer-class {
+    .ant-row {
+      .ant-col {
+        :deep .ant-input-number {
+          width: 34vw !important;
+        }
+      }
+    }
+  }
+</style>
--- a/src/views/tenant/list/TenantAdminFormDrawer.vue
View file @135ef43
+++ b/src/views/tenant/list/TenantAdminFormDrawer.vue
View file @135ef43
@@ -58,6 +58,7 @@
               });
               return [
                 {
+                  required: true,
                   validator(_, value) {
                     return new Promise((resolve, reject) => {
                       if (value == '') {
@@ -76,7 +77,7 @@
                   },
                 },
               ];
-            } catch (e) {}
+            } catch {}
           },
         },
         {