feat:修复没分配首页权限显示404，秋云修复修改密码，wip:设配配置搜集三个子弹窗的数据

@@ -6,7 +6,8 @@ VITE_PUBLIC_PATH = /
 
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
-VITE_PROXY = [["/api","http://192.168.10.117:8082/api"],["/upload","http://192.168.10.116:3300/upload"]]
+# VITE_PROXY = [["/api","http://192.168.10.118:8080/api"],["/upload","http://192.168.10.116:3300/upload"]]
+VITE_PROXY = [["/api","http://101.133.234.90:8080/api"],["/upload","http://192.168.10.116:3300/upload"]]
 # VITE_PROXY=[["/api","https://vvbin.cn/test"]]
 
 # Delete console
@@ -19,4 +20,4 @@ VITE_GLOB_API_URL=/api
 VITE_GLOB_UPLOAD_URL=/upload
 
 # Interface prefix
-VITE_GLOB_API_URL_PREFIX=/v1
+VITE_GLOB_API_URL_PREFIX=/yt

@@ -124,7 +124,7 @@
     "ts-jest": "^27.0.4",
     "ts-node": "^10.2.0",
     "typescript": "4.3.5",
-    "vite": "2.5.0",
+    "vite": "2.6.13",
     "vite-plugin-compression": "^0.3.3",
     "vite-plugin-html": "^2.0.7",
     "vite-plugin-imagemin": "^0.4.3",

@@ -71,7 +71,9 @@ export const notifyAddLeaseApi = (params: NotifyAddreLeaseModel) => {
 export const notifyDeleteApi = (ids: string[]) => {
   return defHttp.delete({
     url: NotifyManagerApi.NOTICE_DELETE_URL,
-    data: ids,
+    data: {
+      ids,
+    },
   });
 };
 

-// import { getMenuList } from '/@/api/sys/menu';
-// import { reactive } from 'vue';
-
-// const isDolang = reactive({
-//   key: 1,
-//   value: '',
-// });
-// //这里判断是否含有首页
-// async function doMenu() {
-//   const routeList = await getMenuList();
-//   const getHomePage = routeList.find((f) => {
-//     return f.path == '/dashboard';
-//   });
-//   if (getHomePage?.path == '/dashboard') {
-//     // router.push('/dashboard');
-//   } else {
-//     const route = routeList[0].path + '';
-//     isDolang.key = 1;
-//     isDolang.value = route;
-//     return isDolang;
-//     // router.push(route);
-//   }
-// }
-
-// setTimeout(() => {
-//   doMenu();
-// }, 1000);
-
-// console.log(isDolang.value);
-// console.log(typeof isDolang.value);
-
-// setTimeout(() => {
-//   console.log(isDolang);
-// }, 1500);
-const firstMenu = '/system/account';
-
 export const PageEnum = {
   // basic login path
   BASE_LOGIN: '/login',
   // basic home path
-  BASE_HOME: firstMenu,
-  // BASE_HOME = '/dashboard',
+  // BASE_HOME: isDolang.value == '/dashboard/workbench' ? '/dashboard/workbench' : isDolang.value,
+  BASE_HOME: '/dashboard/workbench',
   // error page path
   ERROR_PAGE: '/exception',
   // error log page path

@@ -21,11 +21,29 @@
       </transition>
     </template>
   </RouterView>
+  <BasicModal
+    @register="register"
+    v-bind="$attrs"
+    :mask="true"
+    :showCancelBtn="false"
+    :showOkBtn="false"
+    :canFullscreen="false"
+    :closable="false"
+    :maskStyle="maskColor"
+    :height="600"
+    :width="1500"
+    :maskClosable="false"
+    title="请您修改初始密码"
+    :helpMessage="['请您修改初始密码']"
+  >
+    <PasswordDialog />
+  </BasicModal>
   <FrameLayout v-if="getCanEmbedIFramePage" />
 </template>
 
 <script lang="ts">
-  import { computed, defineComponent, unref } from 'vue';
+  import { computed, defineComponent, ref, unref, onMounted } from 'vue';
+  import PasswordDialog from '/@/views/system/password/index.vue';
 
   import FrameLayout from '/@/layouts/iframe/index.vue';
 
@@ -36,10 +54,12 @@
   import { getTransitionName } from './transition';
 
   import { useMultipleTabStore } from '/@/store/modules/multipleTab';
-
+  import { BasicModal, useModal } from '/@/components/Modal';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
   export default defineComponent({
     name: 'PageLayout',
-    components: { FrameLayout },
+    components: { FrameLayout, BasicModal, PasswordDialog },
     setup() {
       const { getShowMultipleTab } = useMultipleTabSetting();
       const tabStore = useMultipleTabStore();
@@ -57,6 +77,17 @@
         return tabStore.getCachedTabList;
       });
 
+      const [register, { openModal }] = useModal();
+      const maskColor = ref({ backgroundColor: 'grey' });
+      const statusModel = ref(false);
+      onMounted(() => {
+        const userInfo = getAuthCache(USER_INFO_KEY);
+        if (userInfo.needSetPwd == true) {
+          statusModel.value = true;
+          openModal(statusModel.value);
+        }
+      });
+
       return {
         getTransitionName,
         openCache,
@@ -64,6 +95,8 @@
         getBasicTransition,
         getCaches,
         getCanEmbedIFramePage,
+        register,
+        maskColor,
       };
     },
   });

@@ -9,6 +9,9 @@ import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
 
 import { RootRoute } from '/@/router/routes';
 
+import { router } from '/@/router';
+import { getMenuList } from '/@/api/sys/menu';
+
 const LOGIN_PATH = PageEnum.BASE_LOGIN;
 
 const ROOT_PATH = RootRoute.path;
@@ -25,6 +28,7 @@ export function createPermissionGuard(router: Router) {
       userStore.getUserInfo.homePath &&
       userStore.getUserInfo.homePath !== PageEnum.BASE_HOME
     ) {
+      console.log('根路径');
       next(userStore.getUserInfo.homePath);
       return;
     }
@@ -60,12 +64,43 @@ export function createPermissionGuard(router: Router) {
       return;
     }
 
-    // Jump to the 404 page after processing the login
+    // if (from.path === LOGIN_PATH) {
+    //   console.log('登录过后');
+    //   router.push('/system/password');
+    // } else {
+    //   // return;
+    // }
     if (
       from.path === LOGIN_PATH &&
       to.name === PAGE_NOT_FOUND_ROUTE.name &&
       to.fullPath !== (userStore.getUserInfo.homePath || PageEnum.BASE_HOME)
     ) {
+      // Jump to the 404 page after processing the login
+      console.log(router);
+      getMenuList().then((res) => {
+        if (res) {
+          console.log(res);
+          const getHomePage = res.find((f) => {
+            return f.path == '/dashboard/workbench';
+          });
+          if (getHomePage?.path == '/dashboard/workbench') {
+            setTimeout(() => {
+              router.push('/stationnotification/notificationmanager');
+            }, 10);
+          } else {
+            const routeF = res[0]?.children[0]?.path || res[0].path;
+            router.push(routeF);
+          }
+        }
+      });
+
+      // if (getHomePage?.path == '/dashboard/workbench') {
+      //   isDolang.value = '/dashboard/workbench';
+      // } else {
+      //   const route = routeList[0].path + '';
+      //   isDolang.key = 1;
+      //   isDolang.value = route;
+      // }
       next(userStore.getUserInfo.homePath || PageEnum.BASE_HOME);
       return;
     }

@@ -21,7 +21,10 @@ export const asyncRoutes = [PAGE_NOT_FOUND_ROUTE, ...routeModuleList];
 export const RootRoute: AppRouteRecordRaw = {
   path: '/',
   name: 'Root',
+  // redirect: '/',
   redirect: PageEnum.BASE_HOME,
+  // redirect: !PageEnum.BASE_HOME ? '/dashboard' : PageEnum.BASE_HOME,
+  // redirect: '/dashboard',
   meta: {
     title: 'Root',
   },

-import type { AppRouteModule } from '/@/router/types';
+// import type { AppRouteModule } from '/@/router/types';
 
-import { LAYOUT } from '/@/router/constant';
-import { t } from '/@/hooks/web/useI18n';
+// import { LAYOUT } from '/@/router/constant';
+// import { t } from '/@/hooks/web/useI18n';
 
-const dashboard: AppRouteModule = {
-  path: '/about',
-  name: 'About',
-  component: LAYOUT,
-  redirect: '/about/index',
-  meta: {
-    hideChildrenInMenu: true,
-    icon: 'simple-icons:about-dot-me',
-    title: t('routes.dashboard.about'),
-    orderNo: 100000,
-  },
-  children: [
-    {
-      path: 'index',
-      name: 'AboutPage',
-      component: () => import('/@/views/sys/about/index.vue'),
-      meta: {
-        title: t('routes.dashboard.about'),
-        icon: 'simple-icons:about-dot-me',
-        hideMenu: true,
-      },
-    },
-  ],
-};
+// const dashboard: AppRouteModule = {
+//   path: '/about',
+//   name: 'About',
+//   component: LAYOUT,
+//   redirect: '/about/index',
+//   meta: {
+//     hideChildrenInMenu: true,
+//     icon: 'simple-icons:about-dot-me',
+//     title: t('routes.dashboard.about'),
+//     orderNo: 100000,
+//   },
+//   children: [
+//     {
+//       path: 'index',
+//       name: 'AboutPage',
+//       component: () => import('/@/views/sys/about/index.vue'),
+//       meta: {
+//         title: t('routes.dashboard.about'),
+//         icon: 'simple-icons:about-dot-me',
+//         hideMenu: true,
+//       },
+//     },
+//   ],
+// };
 
-export default dashboard;
+// export default dashboard;

@@ -5,6 +5,21 @@ import { Rule } from 'ant-design-vue/lib/form/interface';
  */
 
 // 手机号验证
+export const numberRule: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      const reg = /^[0-9]{8}$/;
+      if (!reg.test(value)) {
+        return Promise.reject('只能输入数字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+// 手机号验证
 export const phoneRule: Rule[] = [
   {
     required: true,

@@ -12,49 +12,15 @@
     <div class="md:w-3/10 w-full enter-y">
       <HelpDoc />
     </div>
-    <!-- 密码弹窗 -->
-    <BasicModal
-      @register="register"
-      v-bind="$attrs"
-      :mask="true"
-      :showCancelBtn="false"
-      :showOkBtn="false"
-      :canFullscreen="false"
-      :closable="false"
-      :maskStyle="maskColor"
-      :height="600"
-      :width="1500"
-      :maskClosable="false"
-      title="请您修改初始密码"
-      :helpMessage="['请您修改初始密码']"
-    >
-      <PasswordDialog />
-    </BasicModal>
   </div>
 </template>
 <script lang="ts" setup>
-  import PasswordDialog from '/@/views/system/password/index.vue';
-  import { BasicModal, useModal } from '/@/components/Modal';
-  import { getAuthCache } from '/@/utils/auth';
-  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
-  import { ref, onMounted } from 'vue';
+  import { ref } from 'vue';
   import GrowCard from './components/GrowCard.vue';
   import SiteAnalysis from './components/SiteAnalysis.vue';
   import { Card } from 'ant-design-vue';
   import HelpDoc from './components/HelpDoc.vue';
 
-  const maskColor = ref({ backgroundColor: 'grey' });
-  const statusModel = ref(false);
-  const [register, { openModal }] = useModal();
-  onMounted(() => {
-    const userInfo = getAuthCache(USER_INFO_KEY);
-    if (userInfo.needSetPwd == true) {
-      statusModel.value = true;
-      openModal(statusModel.value);
-    } else if (userInfo.needSetPwd == false) {
-      openModal(statusModel.value);
-    }
-  });
   const loading = ref(true);
   setTimeout(() => {
     loading.value = false;

 <template>
   <div class="step3">
-    <template v-for="(item, index) in alarms" :key="item.id">
+    <template v-for="(item, index) in profileData" :key="item.id">
       <CollapseContainer class="border mb-8">
         <template #action>
           <div @click="deleteAlarmRule(index)" class="cursor-pointer">
@@ -17,7 +17,7 @@
           </BasicForm>
         </CollapseContainer>
         <p>创建报警规则</p>
-        <template v-for="(childItem, createIndex) in item.createRule" :key="childItem.id">
+        <template v-for="(childItem, createIndex) in item.alarms" :key="childItem.id">
           <div class="aic mb-4" style="border: 1px solid #bfbfbf">
             <div class="w-3/4">
               <BasicForm @register="registerFormCreateAlarm" />
@@ -72,15 +72,29 @@
     <a-button style="margin-left: 20px" type="primary" @click="addAlarmRule">添加报警规则</a-button>
   </div>
   <!-- 详情模板 -->
-  <DetailTemplate v-if="isDetailTemplateEnableRuleAlarmRuleConditions" @register="registerModal" />
+  <DetailTemplate
+    v-if="isRuleAlarmRuleConditions == 1"
+    @getAllFields="getAllFieldsFunc"
+    @register="registerModal1"
+  />
   <!-- 启用规则 -->
-  <EnableRule v-if="!isDetailTemplateEnableRuleAlarmRuleConditions" @register="registerModal" />
+  <EnableRule
+    v-if="isRuleAlarmRuleConditions == 2"
+    ref="getChildData2"
+    @getAllFieldsEnab="getAllFieldsEnabFunc"
+    @register="registerModal2"
+  />
   <!-- 报警规则条件 -->
-  <AlarmRuleConditions v-if="isRuleAlarmRuleConditions == 1" @register="registerModal" />
+  <AlarmRuleConditions
+    v-if="isRuleAlarmRuleConditions == 3"
+    ref="getChildData3"
+    @getAllFieldsRule="getAllFieldsRuleFunc"
+    @register="registerModal3"
+  />
 </template>
 
 <script lang="ts">
-  import { defineComponent, ref, unref } from 'vue';
+  import { defineComponent, ref, unref, getCurrentInstance } from 'vue';
   import type { alarmListItem } from '../types/index';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form';
@@ -115,41 +129,60 @@
     },
     emits: ['prev', 'next'],
     setup(_, { emit }) {
-      const isDetailTemplateEnableRuleAlarmRuleConditions = ref(true);
-      const isRuleAlarmRuleConditions = ref(1);
+      const { proxy } = getCurrentInstance();
+      // const isDetailTemplateEnableRuleAlarmRuleConditions = ref(true);
+      const getChildData1 = ref(null);
+      const getChildData2 = ref(null);
+      const getChildData3 = ref(null);
+      const isRuleAlarmRuleConditions = ref(0);
       const getAllFormData: any = ref({});
+      const alarmss: any = ref([]);
+      const emptyObj: any = ref({});
       //告警列表
-      let alarms = ref<alarmListItem[]>([]);
+      let profileData = ref<alarmListItem[]>([]);
       const log = (e) => {
         console.log(e);
       };
       // 添加和删除告警配置
       const deleteAlarmRule = (index: number) => {
-        unref(alarms).splice(index, 1);
+        unref(profileData).splice(index, 1);
       };
       // 上一步
       const prevStep = () => {
         emit('prev');
       };
       const addAlarmRule = () => {
-        unref(alarms).push({
-          id: Date.now(),
-          messageMode: '',
-          propagate: false,
-          propagateRelationTypes: [''],
-          createRule: [
+        unref(profileData).push({
+          // id: Date.now(),
+          // messageMode: '',
+          // propagate: false,
+          // propagateRelationTypes: [''],
+          configuration: {},
+          transportConfiguration: {},
+          provisionConfiguration: {
+            provisionDeviceSecret: '',
+          },
+          // alarms: [
+          //   {
+          //     id: Date.now() + Math.random(),
+          //     alarmVisible: false,
+          //     addKeyFilterVisible: false,
+          //     detailVisible: false,
+          //     detail: '',
+          //   },
+          // ],
+          // clearRule: [],
+          alarms: [
             {
               id: Date.now() + Math.random(),
-              alarmVisible: false,
-              addKeyFilterVisible: false,
-              detailVisible: false,
-              detail: '',
-              filterList: [],
+              alarmType: '',
+              createRules: {},
+              clearRule: {},
+              propagate: true,
+              propagateRelationTypes: [''],
             },
           ],
-          clearRule: [],
         });
-        console.log(alarms.value);
       };
 
       // 表单部分 报警类型
@@ -195,7 +228,7 @@
 
       // 添加‘创建条件’
       const addCreateRole = (index: number) => {
-        unref(alarms)[index].createRule.push({
+        unref(profileData)[index].alarms.push({
           id: Date.now() + Math.random(),
           alarmVisible: false,
           addKeyFilterVisible: false,
@@ -206,7 +239,16 @@
       };
       // 删除‘创建条件’
       const deleteCondition = (index: number, createIndex: number) => {
-        alarms.value[index].createRule.splice(createIndex, 1);
+        profileData.value[index].alarms.splice(createIndex, 1);
+      };
+      const getAllFieldsFunc = (v) => {
+        console.log(v);
+      };
+      const getAllFieldsEnabFunc = (v) => {
+        console.log(v);
+      };
+      const getAllFieldsRuleFunc = (v) => {
+        console.log(v);
       };
 
       const handleFormStep3toStep4Next = async () => {
@@ -216,53 +258,71 @@
           const valueRegisterFormHighSetting = await validateRegisterFormHighSetting();
           const valueRegisterFormCreateAlarm = await validateRegisterFormCreateAlarm();
           const valueRegisterFormClearAlarm = await validateRegisterFormClearAlarm();
+          const getValueRegisterFormHighSetting = {
+            propagate: valueRegisterFormHighSetting?.propagate,
+            propagateRelationTypes: [valueRegisterFormHighSetting?.propagateRelationTypes],
+          };
+          // console.log(proxy.$refs.getChildData1);
+          // console.log(proxy.$refs.getChildData2);
+          // console.log(proxy.$refs.getChildData3);
+          // let getChildValues1 = proxy.$refs.getChildData1.getAllFields();
+          // console.log('详情模板', getChildValues1);
+          // let getChildValues2 = proxy.$refs.getChildData2.getAllFieldsEnab();
+          // console.log('启用规则', getChildValues2);
+          // let getChildValues3 = proxy.$refs.getChildData3.getAllFieldsRule();
+          // console.log('报警规则条件', getChildValues3);
+
+          Object.assign(emptyObj.value, valueRegisterForm, getValueRegisterFormHighSetting);
+          alarmss.value.push(emptyObj.value);
+          const getAlarms = {
+            alarms: alarmss.value,
+          };
           Object.assign(
             getAllFormData.value,
-            valueRegisterForm,
-            valueRegisterFormHighSetting,
-            valueRegisterFormCreateAlarm,
-            valueRegisterFormClearAlarm,
-            alarms.value
+            getAlarms
+            // valueRegisterFormCreateAlarm,
+            // valueRegisterFormClearAlarm
+            // profileData.value
           );
           console.log('第三步的数据', getAllFormData.value);
           emit('next', getAllFormData.value);
         } catch (error) {}
       };
 
-      const [registerModal, { openModal }] = useModal();
+      const [registerModal1, { openModal: openModal1 }] = useModal();
+      const [registerModal2, { openModal: openModal2 }] = useModal();
+      const [registerModal3, { openModal: openModal3 }] = useModal();
 
       const handleOpenDetailTemplate = () => {
-        openModal(true, {
-          isUpdate: false,
-        });
-        isDetailTemplateEnableRuleAlarmRuleConditions.value = true;
-        console.log(isDetailTemplateEnableRuleAlarmRuleConditions.value);
+        isRuleAlarmRuleConditions.value = 1;
+        openModal1(true);
       };
       const handleOpenEnableRule = () => {
-        openModal(true, {
-          isUpdate: false,
-        });
-        isDetailTemplateEnableRuleAlarmRuleConditions.value = false;
-        console.log(isDetailTemplateEnableRuleAlarmRuleConditions.value);
+        isRuleAlarmRuleConditions.value = 2;
+        openModal2(true);
       };
       const handleOpenAlaramRuleConditions = () => {
-        openModal(true, {
-          isUpdate: false,
-        });
-        isRuleAlarmRuleConditions.value = 1;
-        console.log(isRuleAlarmRuleConditions.value);
+        isRuleAlarmRuleConditions.value = 3;
+        openModal3(true);
       };
 
       return {
+        getAllFieldsRuleFunc,
+        getAllFieldsEnabFunc,
+        getAllFieldsFunc,
+        getChildData1,
+        getChildData2,
+        getChildData3,
         isRuleAlarmRuleConditions,
-        isDetailTemplateEnableRuleAlarmRuleConditions,
-        registerModal,
+        registerModal1,
+        registerModal2,
+        registerModal3,
         handleOpenEnableRule,
         handleOpenAlaramRuleConditions,
         handleOpenDetailTemplate,
         handleFormStep3toStep4Next,
         log,
-        alarms,
+        profileData,
         deleteAlarmRule,
         prevStep,
         addAlarmRule,

+{
+  "alarmProfile": {
+    "alarmContactId": "string",
+    "createTime": "2021-12-20T08:19:59.510Z",
+    "creator": "string",
+    "defaultConfig": "string",
+    "description": "string",
+    "deviceProfileId": "string",
+    "enabled": true,
+    "icon": "string",
+    "id": "string",
+    "messageMode": "string",
+    "name": "string",
+    "roleIds": [
+      "string"
+    ],
+    "tenantExpireTime": "2021-12-20T08:19:59.511Z",
+    "tenantId": "string",
+    "tenantStatus": "DISABLED",
+    "updateTime": "2021-12-20T08:19:59.511Z",
+    "updater": "string"
+  },
+  "convertJs": "string",
+  "createTime": "2021-12-20T08:19:59.511Z",
+  "creator": "string",
+  "defaultConfig": "string",
+  "defaultQueueName": "string",
+  "defaultRuleChainId": "string",
+  "description": "string",
+  "enabled": true,
+  "icon": "string",
+  "id": "string",
+  "name": "string",
+  "profileData": {
+    "configuration": {},
+    "transportConfiguration": {},
+    "provisionConfiguration": {
+      "provisionDeviceSecret": "string"
+    },
+    "alarms": [
+      {
+        "id": "highTemperatureAlarmID",
+        "alarmType": "High Temperature Alarm",
+        "createRules": {
+          "additionalProp1": {
+            "condition": {
+              "condition": [
+                {
+                  "key": {
+                    "type": "TIME_SERIES",
+                    "key": "temp"
+                  },
+                  "valueType": "NUMERIC",
+                  "value": {},
+                  "predicate": {}
+                }
+              ],
+              "spec": {}
+            },
+            "schedule": {
+              "type": "ANY_TIME"
+            },
+            "alarmDetails": "string",
+            "dashboardId": {
+              "id": "784f394c-42b6-435a-983c-b7beff2784f9",
+              "entityType": "DASHBOARD"
+            }
+          },
+          "additionalProp2": {
+            "condition": {
+              "condition": [
+                {
+                  "key": {
+                    "type": "TIME_SERIES",
+                    "key": "temp"
+                  },
+                  "valueType": "NUMERIC",
+                  "value": {},
+                  "predicate": {}
+                }
+              ],
+              "spec": {}
+            },
+            "schedule": {
+              "type": "ANY_TIME"
+            },
+            "alarmDetails": "string",
+            "dashboardId": {
+              "id": "784f394c-42b6-435a-983c-b7beff2784f9",
+              "entityType": "DASHBOARD"
+            }
+          },
+          "additionalProp3": {
+            "condition": {
+              "condition": [
+                {
+                  "key": {
+                    "type": "TIME_SERIES",
+                    "key": "temp"
+                  },
+                  "valueType": "NUMERIC",
+                  "value": {},
+                  "predicate": {}
+                }
+              ],
+              "spec": {}
+            },
+            "schedule": {
+              "type": "ANY_TIME"
+            },
+            "alarmDetails": "string",
+            "dashboardId": {
+              "id": "784f394c-42b6-435a-983c-b7beff2784f9",
+              "entityType": "DASHBOARD"
+            }
+          }
+        },
+        "clearRule": {
+          "condition": {
+            "condition": [
+              {
+                "key": {
+                  "type": "TIME_SERIES",
+                  "key": "temp"
+                },
+                "valueType": "NUMERIC",
+                "value": {},
+                "predicate": {}
+              }
+            ],
+            "spec": {}
+          },
+          "schedule": {
+            "type": "ANY_TIME"
+          },
+          "alarmDetails": "string",
+          "dashboardId": {
+            "id": "784f394c-42b6-435a-983c-b7beff2784f9",
+            "entityType": "DASHBOARD"
+          }
+        },
+        "propagate": true,
+        "propagateRelationTypes": [
+          "string"
+        ]
+      }
+    ]
+  },
+  "roleIds": [
+    "string"
+  ],
+  "tbProfileId": "string",
+  "tenantExpireTime": "2021-12-20T08:19:59.511Z",
+  "tenantId": "string",
+  "tenantStatus": "DISABLED",
+  "transportType": "COAP",
+  "updateTime": "2021-12-20T08:19:59.511Z",
+  "updater": "string"
+}

+{
+  "name": "hhhhh",
+  "transportType": "COAP",
+  "profileData": {
+    "alarms": [
+      {
+        "alarmType": "1",
+        "propagate": true,
+        "propagateRelationTypes": [
+          "1"
+        ]
+      }
+    ]
+  },
+  "alarmProfile": {
+    "alarmContactId": "ce350734-9504-48c2-82d2-277e3fe5583f",
+    "messageMode": "DING_TALK_MESSAGE"
+  }
+}

 import { FormSchema } from '/@/components/Table';
 
+/**
+ * 所使用的枚举值
+ */
+
+export enum TriggerEnum {
+  IS_DEVICE_ACT = 'DEVICE_ACT',
+  IS_TIME_ACT = 'TIME_ACT',
+  IS_SCENE_ACT = 'SCENE_ACT',
+}
+
+export const isShiDu = (type: string) => {
+  return type === TriggerEnum.IS_DEVICE_ACT;
+};
+export const isWenDu = (type: string) => {
+  return type === TriggerEnum.IS_TIME_ACT;
+};
+
+export const isTimeAll = (type: string) => {
+  return type === TriggerEnum.IS_SCENE_ACT;
+};
+
 export const formSchema: FormSchema[] = [
   {
     field: 'detail',
-    label: '报警详细信息',
+    label: '条件类型',
+    colProps: { span: 24 },
+    component: 'Select',
+    componentProps: {
+      placeholder: '请选择报警日程表',
+      options: [
+        { label: '简单', value: 'DEVICE_ACT' },
+        { label: '持续时间', value: 'TIME_ACT' },
+        { label: '重复', value: 'SCENE_ACT' },
+      ],
+    },
+  },
+  {
+    field: 'type1',
+    label: '动态源类型',
+    colProps: { span: 24 },
+    component: 'Select',
+    componentProps: {
+      placeholder: '请选择动态源类型',
+      options: [
+        { label: '无动态值', value: 'second' },
+        { label: '当前租户', value: 'minute' },
+        { label: '当前客户', value: 'hour' },
+        { label: '当前设备', value: 'day' },
+      ],
+    },
+    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time1',
+    label: '源属性',
+    colProps: { span: 24 },
+    component: 'Input',
+    componentProps: {
+      placeholder: '源属性',
+    },
+    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'type1',
+    label: '动态源类型',
+    colProps: { span: 24 },
+    component: 'Select',
+    componentProps: {
+      placeholder: '请选择动态源类型',
+      options: [
+        { label: '无动态值', value: 'second' },
+        { label: '当前租户', value: 'minute' },
+        { label: '当前客户', value: 'hour' },
+        { label: '当前设备', value: 'day' },
+      ],
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time1',
+    label: '源属性',
+    colProps: { span: 24 },
+    component: 'Input',
+    componentProps: {
+      placeholder: '源属性',
+    },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    label: '持续时间值',
+    colProps: { span: 24 },
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入持续时间值',
+    },
+    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'r',
+    label: '时间单位',
+    colProps: { span: 24 },
+    component: 'Select',
+    componentProps: {
+      placeholder: '请选择报警日程表',
+      options: [
+        { label: '秒', value: 'second' },
+        { label: '分钟', value: 'minute' },
+        { label: '小时', value: 'hour' },
+        { label: '天', value: 'day' },
+      ],
+    },
+    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
+  },
+  {
+    field: 'time',
+    label: '事件计数值必填',
     colProps: { span: 24 },
-    required: true,
     component: 'Input',
     componentProps: {
-      placeholder: '请输入报警详细信息',
+      placeholder: '请输入事件计数值必填',
     },
+    rules: [{ message: '事件计数应在1到2147483637之间', trigger: 'blur' }],
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
 ];

@@ -21,21 +21,35 @@
       BasicModal,
       BasicForm,
     },
-    emits: ['success', 'register'],
-    setup() {
+    emits: ['success', 'register', 'getAllFieldsRule'],
+    setup(_, { emit }) {
+      // const getValueData: any = ref({});
+
       const isUpdate = ref(true);
-      const [registerForm] = useForm({
+      const [registerForm, { getFieldsValue }] = useForm({
         labelWidth: 120,
         schemas: formSchema,
       });
-      const getTitle = computed(() => (!unref(isUpdate) ? '新增报警规则条件' : '编辑报警规则条件'));
-      const [register] = useModalInner((data) => {
+      const getTitle = computed(() => (!unref(isUpdate) ? '添加报警规则条件' : '编辑报警规则条件'));
+      const [register, { closeModal }] = useModalInner((data) => {
         isUpdate.value = !!data?.isUpdate;
       });
       const handleSubmit = () => {
-        console.log(1);
+        const values = getFieldsValue();
+        emit('getAllFieldsRule', values);
+        // console.log(1);
+        // let getV = {};
+        // getAllFieldsRule(getV);
+        closeModal();
       };
+      // function getAllFieldsRule(getV) {
+      //   const values = getFieldsValue();
+      //   getValueData.value = values;
+      //   getV = getValueData.value;
+      //   return getV;
+      // }
       return {
+        // getAllFieldsRule,
         registerForm,
         handleSubmit,
         register,

 import { FormSchema } from '/@/components/Table';
 
-/**
- * 所使用的枚举值
- */
-
-export enum TriggerEnum {
-  IS_DEVICE_ACT = 'DEVICE_ACT',
-  IS_TIME_ACT = 'TIME_ACT',
-  IS_SCENE_ACT = 'SCENE_ACT',
-}
-
-export const isShiDu = (type: string) => {
-  return type === TriggerEnum.IS_DEVICE_ACT;
-};
-export const isWenDu = (type: string) => {
-  return type === TriggerEnum.IS_TIME_ACT;
-};
-
-export const isTimeAll = (type: string) => {
-  return type === TriggerEnum.IS_SCENE_ACT;
-};
-
 export const formSchema: FormSchema[] = [
   {
     field: 'detail',
-    label: '条件类型',
-    colProps: { span: 24 },
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择报警日程表',
-      options: [
-        { label: '简单', value: 'DEVICE_ACT' },
-        { label: '持续时间', value: 'TIME_ACT' },
-        { label: '重复', value: 'SCENE_ACT' },
-      ],
-    },
-  },
-  {
-    field: 'type1',
-    label: '动态源类型',
-    colProps: { span: 24 },
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择动态源类型',
-      options: [
-        { label: '无动态值', value: 'second' },
-        { label: '当前租户', value: 'minute' },
-        { label: '当前客户', value: 'hour' },
-        { label: '当前设备', value: 'day' },
-      ],
-    },
-    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
-  },
-  {
-    field: 'time1',
-    label: '源属性',
-    colProps: { span: 24 },
-    component: 'Input',
-    componentProps: {
-      placeholder: '源属性',
-    },
-    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
-  },
-  {
-    field: 'type1',
-    label: '动态源类型',
-    colProps: { span: 24 },
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择动态源类型',
-      options: [
-        { label: '无动态值', value: 'second' },
-        { label: '当前租户', value: 'minute' },
-        { label: '当前客户', value: 'hour' },
-        { label: '当前设备', value: 'day' },
-      ],
-    },
-    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
-  },
-  {
-    field: 'time1',
-    label: '源属性',
-    colProps: { span: 24 },
-    component: 'Input',
-    componentProps: {
-      placeholder: '源属性',
-    },
-    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
-  },
-  {
-    field: 'time',
-    label: '持续时间值',
-    colProps: { span: 24 },
-    component: 'Input',
-    componentProps: {
-      placeholder: '请输入持续时间值',
-    },
-    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
-  },
-  {
-    field: 'r',
-    label: '时间单位',
-    colProps: { span: 24 },
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择报警日程表',
-      options: [
-        { label: '秒', value: 'second' },
-        { label: '分钟', value: 'minute' },
-        { label: '小时', value: 'hour' },
-        { label: '天', value: 'day' },
-      ],
-    },
-    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
-  },
-  {
-    field: 'time',
-    label: '事件计数值必填',
+    label: '报警详细信息',
     colProps: { span: 24 },
+    required: true,
     component: 'Input',
     componentProps: {
-      placeholder: '请输入事件计数值必填',
+      placeholder: '请输入报警详细信息',
     },
-    rules: [{ message: '事件计数应在1到2147483637之间', trigger: 'blur' }],
-    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
 ];

@@ -21,21 +21,33 @@
       BasicModal,
       BasicForm,
     },
-    emits: ['success', 'register'],
-    setup() {
+    emits: ['success', 'register', 'getAllFields'],
+    setup(_, { emit }) {
+      // const getValueData: any = ref({});
       const isUpdate = ref(true);
-      const [registerForm] = useForm({
+      const [registerForm, { getFieldsValue }] = useForm({
         labelWidth: 120,
         schemas: formSchema,
       });
       const getTitle = computed(() => (!unref(isUpdate) ? '新增详情模板' : '编辑详情模板'));
-      const [register] = useModalInner((data) => {
+      const [register, { closeModal }] = useModalInner((data) => {
         isUpdate.value = !!data?.isUpdate;
       });
       const handleSubmit = () => {
-        console.log(1);
+        const values = getFieldsValue();
+        emit('getAllFields', values);
+        // let getV = {};
+        // getAllFields(getV);
+        closeModal();
       };
+      // function getAllFields(getV) {
+      //   const values = getFieldsValue();
+      //   getValueData.value = values;
+      //   getV = getValueData.value;
+      //   return getV;
+      // }
       return {
+        // getAllFields,
         registerForm,
         handleSubmit,
         register,

@@ -61,7 +61,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'time1',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -70,7 +70,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'time2',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -90,7 +90,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'time3',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -99,7 +99,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'time4',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -118,7 +118,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'time5',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -127,7 +127,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'time6',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -146,7 +146,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'time7',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -155,7 +155,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'time8',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -174,7 +174,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'time9',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -183,7 +183,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'time33',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -202,7 +202,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'time333',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -211,7 +211,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'time131',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -230,7 +230,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'time3423',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -239,7 +239,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'time3431',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -296,7 +296,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'timerrw',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {
@@ -305,7 +305,7 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isWenDu(Reflect.get(values, 'detail')),
   },
   {
-    field: 'time',
+    field: 'timewwq',
     component: 'TimePicker',
     label: '时间选择',
     colProps: {

@@ -21,21 +21,33 @@
       BasicModal,
       BasicForm,
     },
-    emits: ['success', 'register'],
-    setup() {
+    emits: ['success', 'register', 'getAllFieldsEnab'],
+    setup(_, { emit }) {
+      // const getValueData: any = ref({});
       const isUpdate = ref(true);
-      const [registerForm] = useForm({
+      const [registerForm, { getFieldsValue }] = useForm({
         labelWidth: 120,
         schemas: formSchema,
       });
       const getTitle = computed(() => (!unref(isUpdate) ? '新增报警日程表' : '编辑报警日程表'));
-      const [register] = useModalInner((data) => {
+      const [register, { closeModal }] = useModalInner((data) => {
         isUpdate.value = !!data?.isUpdate;
       });
       const handleSubmit = () => {
-        console.log(1);
+        const values = getFieldsValue();
+        emit('getAllFieldsEnab', values);
+        // let getV = {};
+        // getAllFieldsEnab(getV);
+        closeModal();
       };
+      // function getAllFieldsEnab(getV) {
+      //   const values = getFieldsValue();
+      //   getValueData.value = values;
+      //   getV = getValueData.value;
+      //   return getV;
+      // }
       return {
+        // getAllFieldsEnab,
         registerForm,
         handleSubmit,
         register,

@@ -13,12 +13,30 @@ interface createRule {
 interface clearRule {
   detail: string;
 }
+
+interface provisionConfigurationD {
+  provisionDeviceSecret: string;
+}
+
+interface IAddAlarms {
+  id: number;
+  alarmType: string;
+  createRules: object;
+  clearRule: object;
+  propagate: true;
+  propagateRelationTypes: string[];
+}
+
 export interface alarmListItem {
-  id?: number;
-  alarmType?: string;
-  messageMode?: string;
-  propagate?: boolean;
-  propagateRelationTypes?: string[];
-  createRule?: createRule[];
-  clearRule?: clearRule[];
+  configuration?: object;
+  transportConfiguration?: object;
+  provisionConfiguration?: provisionConfigurationD;
+  // id?: number;
+  alarms?: IAddAlarms[];
+  // alarmType?: string;
+  // messageMode?: string;
+  // createRule?: createRule[];
+  // clearRule?: clearRule[];
+  // propagate?: boolean;
+  // propagateRelationTypes?: string[];
 }

@@ -117,30 +117,7 @@ export const formSchema: FormSchema[] = [
       });
     },
   },
-  {
-    field: 'organizationId',
-    label: '所属组织',
-    colProps: { span: 12 },
-    component: 'ApiTreeSelect',
-    componentProps: {
-      api: async () => {
-        const data = await getOrganizationList();
-        copyTransFun(data as any as any[]);
-        // const filterData = data.map((m) => {
-        //   return {
-        //     label: m.label,
-        //     value: m.value,
-        //   };
-        // });
-        // return filterData;
-        return data;
-      },
-      onChange: (v) => {
-        isDeptId.value = v;
-      },
-    },
-    ifShow: ({ values }) => isOrg(Reflect.get(values, 'receiverType')),
-  },
+
   {
     field: 'receiverType',
     required: true,
@@ -194,6 +171,30 @@ export const formSchema: FormSchema[] = [
     // },
   },
   {
+    field: 'organizationId',
+    label: '所属组织',
+    colProps: { span: 12 },
+    component: 'ApiTreeSelect',
+    componentProps: {
+      api: async () => {
+        const data = await getOrganizationList();
+        copyTransFun(data as any as any[]);
+        // const filterData = data.map((m) => {
+        //   return {
+        //     label: m.label,
+        //     value: m.value,
+        //   };
+        // });
+        // return filterData;
+        return data;
+      },
+      onChange: (v) => {
+        isDeptId.value = v;
+      },
+    },
+    ifShow: ({ values }) => isOrg(Reflect.get(values, 'receiverType')),
+  },
+  {
     field: '',
     component: 'Input',
     label: '',

@@ -32,7 +32,7 @@ export const formSchema: FormSchema[] = [
           required: true,
           validator: (_, value) => {
             if (!value) {
-              return Promise.reject('不能为空');
+              return Promise.reject('密码不能为空');
             }
             if (value !== values.passwordNew) {
               return Promise.reject('两次输入的密码不一致!');

@@ -36,13 +36,15 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'isolatedTbRuleEngine',
-    label: '隔离板芯容器的加工',
+    label: '',
     component: 'Checkbox',
+    renderComponentContent: '隔离板芯容器的加工',
   },
   {
     field: 'isolatedTbCore',
-    label: '在独立的ThinngsBoard规则引擎中处理',
+    label: '',
     component: 'Checkbox',
+    renderComponentContent: '在独立的ThinngsBoard规则引擎中处理',
   },
   {
     field: 'description',

 import { FormSchema } from '/@/components/Table';
+import { numberRule } from '/@/utils/rules';
 
 export const formSchema: FormSchema[] = [
   {
     field: 'maxDevices',
     label: '最大设备数（0-无限制）',
-    component: 'InputNumber',
+    component: 'Input',
+    colProps: { span: 24 },
     componentProps: {
       placeholder: '请输入最大设备数',
     },
+    rules: numberRule,
   },
   {
     field: 'maxAssets',
     label: '最大资产数（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入最大资产',
     },
@@ -22,7 +27,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxCustomers',
     label: '最大客户数（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入最大客户数',
     },
@@ -31,7 +38,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxUsers',
     label: '最大用户数（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入最大用户数',
     },
@@ -40,7 +49,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxDashboards',
     label: '仪表板的最大数量（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入仪表板的最大数量',
     },
@@ -49,25 +60,31 @@ export const formSchema: FormSchema[] = [
     field: 'maxRuleChains',
     label: '最大规则链数（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入最大规则链数',
     },
   },
   {
     field: 'maxResourcesInBytes',
-    label: 'Maximun sum of resource files in bytes（0-unlimited）',
+    label: '以字节为单位的资源文件的最大总和（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入',
     },
   },
   {
     field: 'maxOtaPackagesInBytes',
-    label: 'Maximun sum of ota packages files size in bytes（0-unlimited）',
+    label: 'Ota包文件大小的最大总和（字节）（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入',
     },
@@ -76,7 +93,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxTransportMessages',
     label: '最大传输消息数（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入最大传输消息数',
     },
@@ -85,7 +104,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxTransportDataPoints',
     label: '传输数据点的最大数量（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入传输数据点的最大数量',
     },
@@ -94,7 +115,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxREExecutions',
     label: '最大规则引擎数（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入最大规则引擎数',
     },
@@ -104,7 +127,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxJSExecutions',
     label: '最大JavaScript执行数（0-不受限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入最大JavaScript执行数',
     },
@@ -113,7 +138,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxDPStorageDays',
     label: '最大日存储数据点数（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入最大日存储数据点数',
     },
@@ -122,25 +149,31 @@ export const formSchema: FormSchema[] = [
     field: 'defaultStorageTtlDays',
     label: '默认存储 TTL 天数（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入默认存储 TTL 天数',
     },
   },
   {
     field: 'alarmsTtlDays',
-    label: 'Alams TTL days（0-unlimaited）',
+    label: 'Alams TTL days（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入Alams TTL days',
     },
   },
   {
     field: 'rpcTtlDays',
-    label: 'RPC TTL days（0-unlimaited）',
+    label: 'RPC TTL days（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入RPC TTL days',
     },
@@ -149,7 +182,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxRuleNodeExecutionsPerMessage',
     label: '每条消息的最大规则节点执行数（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入每条消息的最大规则节点执行数',
     },
@@ -158,7 +193,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxEmails',
     label: '发送的最大电子邮件数（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入发送的最大电子邮件数',
     },
@@ -167,16 +204,19 @@ export const formSchema: FormSchema[] = [
     field: 'maxSms',
     label: '发送的最大短信数（0-无限制）',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
+
     componentProps: {
       placeholder: '请输入发送的最大短信数',
     },
   },
   {
     field: 'maxCreatedAlarms',
-    label: 'Maximum number of alarms created (0 - unlimited)',
+    label: '创建的最大报警数 (0 - 无限制)',
     colProps: { span: 24 },
-    component: 'InputNumber',
+    component: 'Input',
+    rules: numberRule,
     componentProps: {
       placeholder: '请输入maxCreatedAlarms',
     },
@@ -186,6 +226,7 @@ export const formSchema: FormSchema[] = [
     label: '传输租户消息速率限制',
     colProps: { span: 24 },
     component: 'Input',
+
     componentProps: {
       placeholder: '请输入传输租户消息速率限制',
     },
@@ -195,6 +236,7 @@ export const formSchema: FormSchema[] = [
     label: '租户遥测消息速率限制',
     colProps: { span: 24 },
     component: 'Input',
+
     componentProps: {
       placeholder: '请输入租户遥测消息速率限制',
     },
@@ -204,6 +246,7 @@ export const formSchema: FormSchema[] = [
     label: '租户遥测数据点速率限制',
     colProps: { span: 24 },
     component: 'Input',
+
     componentProps: {
       placeholder: '请输入租户遥测数据点速率限制',
     },
@@ -213,6 +256,7 @@ export const formSchema: FormSchema[] = [
     label: '传输设备消息速率限制',
     colProps: { span: 24 },
     component: 'Input',
+
     componentProps: {
       placeholder: '请输入传输设备消息速率限制',
     },
@@ -222,6 +266,7 @@ export const formSchema: FormSchema[] = [
     label: '设备遥测消息速率限制',
     colProps: { span: 24 },
     component: 'Input',
+
     componentProps: {
       placeholder: '请输入设备遥测消息速率限制',
     },

@@ -5,7 +5,7 @@
       @register="registerDrawer"
       showFooter
       :title="getTitle"
-      width="500px"
+      width="700px"
       @ok="handleSubmit"
     >
       <BasicForm @register="registerForm" />