fix:修复修改密码和404

 export const PageEnum = {
+  SYSTEM_PASSWORD: '/system/password',
   // basic login path
   BASE_LOGIN: '/login',
   // basic home path

@@ -21,7 +21,7 @@
       </transition>
     </template>
   </RouterView>
-  <BasicModal
+  <!-- <BasicModal
     @register="register"
     v-bind="$attrs"
     :mask="true"
@@ -38,13 +38,13 @@
     :keyboard="false"
   >
     <PasswordDialog />
-  </BasicModal>
+  </BasicModal> -->
   <FrameLayout v-if="getCanEmbedIFramePage" />
 </template>
 
 <script lang="ts">
-  import { computed, defineComponent, ref, unref, onMounted } from 'vue';
-  import PasswordDialog from '/@/views/system/password/index.vue';
+  import { computed, defineComponent, unref, onMounted } from 'vue';
+  // import PasswordDialog from '/@/views/system/password/index.vue';
 
   import FrameLayout from '/@/layouts/iframe/index.vue';
 
@@ -55,12 +55,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';
+  // 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, BasicModal, PasswordDialog },
+    components: { FrameLayout },
     setup() {
       const { getShowMultipleTab } = useMultipleTabSetting();
       const tabStore = useMultipleTabStore();
@@ -78,15 +78,15 @@
         return tabStore.getCachedTabList;
       });
 
-      const [register, { openModal }] = useModal();
-      const maskColor = ref({ backgroundColor: 'grey' });
-      const statusModel = ref(false);
+      // 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);
-        }
+        // const userInfo = getAuthCache(USER_INFO_KEY);
+        // if (userInfo.needSetPwd == true) {
+        //   statusModel.value = true;
+        //   openModal(statusModel.value);
+        // }
       });
 
       return {
@@ -96,8 +96,8 @@
         getBasicTransition,
         getCaches,
         getCanEmbedIFramePage,
-        register,
-        maskColor,
+        // register,
+        // maskColor,
       };
     },
   });

@@ -11,24 +11,30 @@ import { RootRoute } from '/@/router/routes';
 
 import { router } from '/@/router';
 import { getMenuList } from '/@/api/sys/menu';
+import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+import { getAuthCache } from '/@/utils/auth';
+import { ref } from 'vue';
 
 const LOGIN_PATH = PageEnum.BASE_LOGIN;
 
 const ROOT_PATH = RootRoute.path;
 
 const whitePathList: PageEnum[] = [LOGIN_PATH];
+// const userInfo1 = getAuthCache(USER_INFO_KEY);
+// const userInfo = ref(userInfo1);
 
 export function createPermissionGuard(router: Router) {
   const userStore = useUserStoreWithOut();
   const permissionStore = usePermissionStoreWithOut();
   router.beforeEach(async (to, from, next) => {
+    const userInfo1 = await getAuthCache(USER_INFO_KEY);
+    const userInfo = ref(userInfo1);
     if (
       from.path === ROOT_PATH &&
       to.path === PageEnum.BASE_HOME &&
       userStore.getUserInfo.homePath &&
       userStore.getUserInfo.homePath !== PageEnum.BASE_HOME
     ) {
-      console.log('根路径');
       next(userStore.getUserInfo.homePath);
       return;
     }
@@ -64,42 +70,87 @@ export function createPermissionGuard(router: Router) {
       return;
     }
 
+    if (from.path === LOGIN_PATH && userInfo.value?.needSetPwd == false) {
+      const getMenuListData = await getMenuList();
+      const getHomePage = getMenuListData.find((f) => {
+        return f.path == '/dashboard/workbench';
+      });
+      if (getHomePage?.path == '/dashboard/workbench') {
+        setTimeout(() => {
+          router.push('/dashboard/workbench');
+        }, 200);
+      } else {
+        const routeF = getMenuListData[0]?.children[0]?.path || getMenuListData[0].path;
+        setTimeout(() => {
+          router.push(routeF);
+        }, 200);
+      }
+      // setTimeout(() => {
+      //   console.log('无需修改密码，跳到首页');
+      //   router.push('/dashboard/workbench');
+      // }, 200);
+    }
+
+    if (from.path === LOGIN_PATH && userInfo.value?.needSetPwd == true) {
+      // console.log('需要修改密码，跳到修改密码');
+      setTimeout(() => {
+        router.push('/system/password');
+      }, 200);
+    }
+
     // if (from.path === LOGIN_PATH) {
-    //   console.log('登录过后');
-    //   router.push('/system/password');
-    // } else {
-    //   // return;
+    //   const getMenuListData = await getMenuList();
+    //   // getMenuList().then((res) => {
+    //   if (getMenuListData) {
+    //     const getHomePage = getMenuListData.map((f) => {
+    //       if (f?.children) {
+    //         const getFilterPath = f.children.filter((f1) => {
+    //           return f1.path == '/system/password';
+    //         });
+    //         return getFilterPath;
+    //       }
+    //     });
+    //     console.log(getHomePage?.at(-1)[0]?.path);
+    //     // getHomePage?.at(-1)[0]?.path == '/system/password'
+    //     if (userInfo.value?.needSetPwd == false) {
+    //       setTimeout(() => {
+    //         router.push('/dashboard/workbench');
+    //       }, 10);
+    //     }
+    //     if (userInfo.value?.needSetPwd == true && getHomePage?.at(-1)[0]?.path == undefined) {
+    //       setTimeout(() => {
+    //         router.push('/system/password');
+    //       }, 10);
+    //     }
+    //   }
+    //   // });
     // }
+
     if (
       from.path === LOGIN_PATH &&
       to.name === PAGE_NOT_FOUND_ROUTE.name &&
       to.fullPath !== (userStore.getUserInfo.homePath || PageEnum.BASE_HOME)
     ) {
+      // console.log('404页面', 'res');
       // Jump to the 404 page after processing the login
-      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;
+      const getMenuListData = await getMenuList();
+      // getMenuList().then((res) => {
+      if (getMenuListData) {
+        const getHomePage = getMenuListData.find((f) => {
+          return f.path == '/dashboard/workbench';
+        });
+        if (getHomePage?.path == '/dashboard/workbench') {
+          setTimeout(() => {
+            router.push('/dashboard/workbench');
+          }, 10);
+        } else {
+          const routeF = res[0]?.children[0]?.path || res[0].path;
+          setTimeout(() => {
             router.push(routeF);
-          }
+          }, 10);
         }
-      });
-
-      // 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;
     }

@@ -76,3 +76,31 @@ export const ERROR_LOG_ROUTE: AppRouteRecordRaw = {
     },
   ],
 };
+
+// export const UPDATE_SYSTEM_PASSWORD: AppRouteRecordRaw = {
+//   path: '/system',
+//   name: 'routes.common.system.system',
+//   component: LAYOUT,
+//   redirect: '/system/systemManagement',
+//   meta: {
+//     icon: 'bx:bx-home',
+//     title: 'routes.common.system.system',
+//     status: '0',
+//     menuType: '0',
+//   },
+//   children: [
+//     {
+//       path: '/system/password',
+//       name: 'routes.common.system.modifyPassword',
+//       component: () => import('/@/views/system/password/index.vue'),
+//       meta: {
+//         icon: 'bx:bx-home',
+//         title: 'routes.common.system.modifyPassword',
+//         menuType: '1',
+//         ignoreKeepAlive: true,
+//         hideMenu: false,
+//         status: '0',
+//       },
+//     },
+//   ],
+// };

@@ -16,7 +16,9 @@ import { getMenuList } from '/@/api/sys/menu';
 import { getPermCode } from '/@/api/sys/user';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { PageEnum } from '/@/enums/pageEnum';
-import { router } from '/@/router';
+import { router as navRouter } from '/@/router';
+import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+import { getAuthCache } from '/@/utils/auth';
 interface PermissionState {
   // Permission code list
   permCodeList: string[] | number[];
@@ -177,18 +179,55 @@ export const usePermissionStore = defineStore({
           // this function may only need to be executed once, and the actual project can be put at the right time by itself
           let routeList: AppRouteRecordRaw[] = [];
           try {
-            this.changePermissionCode();
-            routeList = (await getMenuList()) as AppRouteRecordRaw[];
-            //这里判断是否含有首页
-            // console.log(routeList);
-            const getHomePage = routeList.find((f) => {
-              return f.path == '/dashboard';
-            });
-            if (getHomePage?.path == '/dashboard') {
-              router.push('/dashboard/workbench');
+            // this.changePermissionCode();
+            // routeList = (await getMenuList()) as AppRouteRecordRaw[];
+            const userInfo = getAuthCache(USER_INFO_KEY);
+            if (userInfo?.needSetPwd == true) {
+              routeList = [
+                {
+                  name: 'routes.common.system.system',
+                  parentId: '',
+                  children: [
+                    {
+                      id: 'a8ffa8c5-637e-476b-a9e6-b60cebe95718',
+                      createTime: '2021-09-10 20:50:55',
+                      updateTime: '2021-11-16 18:58:24',
+                      name: 'routes.common.system.modifyPassword',
+                      parentId: 'a8ffa8c5-637e-471b-a9e6-b60cebe95713',
+                      children: [],
+                      path: '/system/password',
+                      type: 'SYSADMIN',
+                      permission: 'system:password:view',
+                      sort: 6,
+                      component: '/system/password/index',
+                      meta: {
+                        icon: 'bx:bx-home',
+                        title: 'routes.common.system.modifyPassword',
+                        menuType: '1',
+                        ignoreKeepAlive: true,
+                        hideMenu: false,
+                        status: '0',
+                      },
+                      redirect: '',
+                    },
+                  ],
+                  path: '/system',
+                  type: 'SYSADMIN',
+                  permission: '',
+                  sort: 6,
+                  component: 'LAYOUT',
+                  meta: {
+                    icon: 'bx:bx-home',
+                    title: 'routes.common.system.system',
+                    status: '0',
+                    menuType: '0',
+                  },
+                  redirect: '/system/systemManagement',
+                },
+              ] as AppRouteRecordRaw[];
             } else {
-              const route = routeList[0].path + '';
-              router.push(route);
+              this.changePermissionCode();
+              routeList = (await getMenuList()) as AppRouteRecordRaw[];
             }
           } catch (error) {
             console.error(error);

@@ -20,26 +20,43 @@
           <BasicForm :showSubmitButton="false" :showResetButton="false" @register="registerTrans"
         /></TabPane>
         <TabPane key="3" tab="报警规则">
-          <BasicForm
-            :showSubmitButton="false"
-            :showResetButton="false"
-            @register="registerStep3Schemas"
-          />
-          <BasicForm
-            :showSubmitButton="false"
-            :showResetButton="false"
-            @register="registerStep3HighSetting"
-          />
-          <BasicForm
-            :showSubmitButton="false"
-            :showResetButton="false"
-            @register="registerStep3CreateAlarm"
-          />
-          <BasicForm
-            :showSubmitButton="false"
-            :showResetButton="false"
-            @register="registerStep3RuleAlarm"
-          />
+          <div style="padding-top: 10px">
+            <BasicForm
+              :showSubmitButton="false"
+              :showResetButton="false"
+              @register="registerStep3Schemas"
+            />
+            <BasicForm
+              :showSubmitButton="false"
+              :showResetButton="false"
+              @register="registerStep3HighSetting"
+            />
+            <BasicForm
+              :showSubmitButton="false"
+              :showResetButton="false"
+              @register="registerStep3CreateAlarm"
+            />
+            <BasicForm
+              :showSubmitButton="false"
+              :showResetButton="false"
+              @register="registerStep3RuleAlarm"
+            />
+            <BasicForm
+              :showSubmitButton="false"
+              :showResetButton="false"
+              @register="registerStep3Condition"
+            />
+            <BasicForm
+              :showSubmitButton="false"
+              :showResetButton="false"
+              @register="registerStep3Enable"
+            />
+            <BasicForm
+              :showSubmitButton="false"
+              :showResetButton="false"
+              @register="registerStep3TemplateDetail"
+            />
+          </div>
         </TabPane>
         <TabPane key="4" tab="告警管理">
           <BasicForm :showSubmitButton="false" :showResetButton="false" @register="registerContact"
@@ -61,8 +78,13 @@
     step3HighSetting,
     step3CreateAlarm,
     alertContactsSchemas,
+    echoFormSchema,
   } from './step/data';
 
+  import { formSchema as conditionFormSchema } from './step/cpns/alarmruleconditions/config';
+  import { formSchema as enableSchema } from './step/cpns/enablerule/config';
+  import { formSchema as detailSchema } from './step/cpns/detailtemplate/config';
+
   export default defineComponent({
     name: 'ConfigDrawer',
     components: { Tabs, TabPane, BasicModal, BasicForm },
@@ -76,89 +98,111 @@
         () => activeKey.value,
         (v) => {
           dataInfo.value = v;
+          // switch (dataInfo.value) {
+          //   case '1':
+          //     console.log(1);
+          //     break;
+          //   case '2':
+          //     console.log(2);
+          //     break;
+          //   case '3':
+          //     console.log(3);
+          //     break;
+          //   case '4':
+          //     console.log(4);
+          //     break;
+          // }
         }
       );
-      const [registerDetail, { setFieldsValue }] = useForm({
+      const [registerDetail, { setFieldsValue: setRegisterDetail }] = useForm({
         schemas: step1Schemas,
         actionColOptions: {
           span: 24,
         },
       });
-      const [registerTrans, { setFieldsValue }] = useForm({
+      const [registerTrans, { setFieldsValue: setRegisterTrans }] = useForm({
         schemas: step2Schemas,
         actionColOptions: {
           span: 24,
         },
       });
-      const [registerStep3Schemas, { setFieldsValue }] = useForm({
+      const [registerStep3Schemas, { setFieldsValue: setRegisterStep3Schemas }] = useForm({
         schemas: step3Schemas,
         actionColOptions: {
           span: 24,
         },
       });
-      const [registerStep3HighSetting, { setFieldsValue }] = useForm({
+      const [registerStep3HighSetting, { setFieldsValue: setRegisterStep3HighSetting }] = useForm({
         schemas: step3HighSetting,
         actionColOptions: {
           span: 24,
         },
       });
-      const [registerStep3CreateAlarm, { setFieldsValue }] = useForm({
+      const [registerStep3CreateAlarm, { setFieldsValue: setRegisterStep3CreateAlarm }] = useForm({
         schemas: step3CreateAlarm,
         actionColOptions: {
           span: 24,
         },
       });
-      const [registerContact, { setFieldsValue }] = useForm({
+      const [registerContact, { setFieldsValue: setRegisterContact }] = useForm({
         schemas: alertContactsSchemas,
         actionColOptions: {
           span: 24,
         },
       });
-      const [registerStep3RuleAlarm, { setFieldsValue }] = useForm({
-        schemas: alertContactsSchemas,
+      const [registerStep3RuleAlarm, { setFieldsValue: setRegisterStep3RuleAlarm }] = useForm({
+        schemas: echoFormSchema,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+      const [registerStep3Condition, { setFieldsValue: setRegisterStep3Condition }] = useForm({
+        schemas: conditionFormSchema,
         actionColOptions: {
           span: 24,
         },
       });
+      const [registerStep3Enable, { setFieldsValue: setRegisterStep3Enable }] = useForm({
+        schemas: enableSchema,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+      const [registerStep3TemplateDetail, { setFieldsValue: setRegisterStep3TemplateDetail }] =
+        useForm({
+          schemas: detailSchema,
+          actionColOptions: {
+            span: 24,
+          },
+        });
+
       const [register] = useModalInner(async (data) => {
         activeKey.value = '1';
         isUpdate.value = !!data?.isUpdate;
         descInfo.value = await deviceConfigGetDetail(data.record.id);
-        console.log(descInfo.value);
-        switch (dataInfo.value) {
-          case '1':
-            // await setRegisterDetail({ ...descInfo.value });
-            setFieldsFunc(descInfo.value);
-            break;
-          case '2':
-            // await setRegisterTrans({ ...descInfo.value });
-            setFieldsFunc(descInfo.value);
-
-            break;
-          case '3':
-            // await setRegisterStep3Schemas({ ...descInfo.value });
-            // await setRegisterStep3HighSetting({ ...descInfo.value });
-            // await setRegisterStep3CreateAlarm({ ...descInfo.value });
-            // await setRegisterStep3RuleAlarm({ ...descInfo.value });
-            setFieldsFunc(descInfo.value);
-
-            break;
-          case '4':
-            // await setRegisterContact({ ...descInfo.value });
-            setFieldsFunc(descInfo.value);
-
-            break;
-            deault: break;
+        try {
+          await setRegisterDetail({ ...descInfo.value });
+          await setRegisterTrans({ ...descInfo.value });
+          await setRegisterStep3Schemas({ ...descInfo.value });
+          await setRegisterStep3HighSetting({ ...descInfo.value });
+          await setRegisterStep3CreateAlarm({ ...descInfo.value });
+          await setRegisterStep3RuleAlarm({ ...descInfo.value });
+          await setRegisterContact({ ...descInfo.value });
+          await setRegisterStep3Condition({ ...descInfo.value });
+          await setRegisterStep3Enable({ ...descInfo.value });
+          await setRegisterStep3TemplateDetail({ ...descInfo.value });
+        } catch (e) {
+          return e;
         }
       });
-      const setFieldsFunc = (v) => {
-        setFieldsValue(v);
-      };
       const getTitle = computed(() => {
         return '设备配置详情';
       });
 
       return {
+        registerStep3TemplateDetail,
+        registerStep3Enable,
+        registerStep3Condition,
         registerStep3RuleAlarm,
         registerContact,
         registerStep3HighSetting,

@@ -330,9 +330,12 @@
           },
         ];
         const findDayByValue = findDay.map((f, i) => {
-          console.log(i);
-          if (f.value == v.daysOfWeek[i]) {
-            return f.label;
+          try {
+            if (f.value == v.daysOfWeek[i]) {
+              return f.label;
+            }
+          } catch (e) {
+            console.log(e);
           }
         });
 

-{
-  "name": "测试2",
-  "description": "测试2",
-  "transportType": "COAP",
-  "profileData": {
-    "alarms": [
-      {
-        "alarmType": "测试2",
-        "propagate": true,
-        "propagateRelationTypes": [
-          "测试2"
-        ],
-        "createRules": {
-          "MAJOR": {
-            "alarmDetails": "测试2",
-            "schedule": {
-              "type": "SPECIFIC_TIME",
-              "daysOfWeek": [
-                "1",
-                "2",
-                "3"
-              ],
-              "endsOn": "14:11:27",
-              "timezone": "Africa/Abidjan (UTC+00:00)"
-            },
-            "condition": {
-              "condition": [
-                {
-                  "key": {
-                    "type": "TIME_SERIES",
-                    "key": "CO2"
-                  },
-                  "valueType": "NUMERIC",
-                  "predicate": {
-                    "operation": "LESS",
-                    "value": {
-                      "defaultValue": 2
-                    },
-                    "type": "NUMERIC"
-                  }
-                }
-              ],
-              "spec": {
-                "type": "DURATION",
-                "unit": "DAYS",
-                "predicate": {
-                  "defaultValue": 3,
-                  "dynamicValue": {
-                    "sourceType": "CURRENT_TENANT",
-                    "sourceAttribute": "测试2"
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    ]
-  },
-  "alarmProfile": {
-    "messageMode": "PHONE_MESSAGE"
-  }
-}

@@ -4,7 +4,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'alarmDetails',
     label: '报警详细信息',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     required: true,
     component: 'Input',
     componentProps: {

@@ -25,7 +25,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'schedule',
     label: '报警日程表',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     required: true,
     component: 'Select',
     componentProps: {
@@ -40,7 +40,8 @@ export const formSchema: FormSchema[] = [
   {
     field: 'timezone',
     label: '时区',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
+
     required: true,
     component: 'Select',
     componentProps: {
@@ -57,7 +58,7 @@ export const formSchema: FormSchema[] = [
   },
 
   {
-    field: 'daysOfWeek',
+    field: 'daysOfWeek1',
     component: 'Checkbox',
     label: '星期一',
     colProps: {
@@ -67,18 +68,18 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'startsOn',
+    field: 'startsOn1',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '开始时间选择',
     colProps: {
       span: 8,
     },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'endsOn',
+    field: 'endsOn1',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '结束时间选择',
     colProps: {
       span: 8,
     },
@@ -86,7 +87,7 @@ export const formSchema: FormSchema[] = [
   },
 
   {
-    field: 'daysOfWeek',
+    field: 'daysOfWeek2',
     component: 'Checkbox',
     label: '星期二',
     colProps: {
@@ -96,25 +97,25 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'startsOn',
+    field: 'startsOn2',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '开始时间选择',
     colProps: {
       span: 8,
     },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'endsOn',
+    field: 'endsOn2',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '结束时间选择',
     colProps: {
       span: 8,
     },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'daysOfWeek',
+    field: 'daysOfWeek3',
     component: 'Checkbox',
     label: '星期三',
     colProps: {
@@ -124,25 +125,25 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'startsOn',
+    field: 'startsOn3',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '开始时间选择',
     colProps: {
       span: 8,
     },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'endsOn',
+    field: 'endsOn3',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '结束时间选择',
     colProps: {
       span: 8,
     },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'daysOfWeek',
+    field: 'daysOfWeek4',
     component: 'Checkbox',
     label: '星期四',
     colProps: {
@@ -152,25 +153,25 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'startsOn',
+    field: 'startsOn4',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '开始时间选择',
     colProps: {
       span: 8,
     },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'endsOn',
+    field: 'endsOn4',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '结束时间选择',
     colProps: {
       span: 8,
     },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'daysOfWeek',
+    field: 'daysOfWeek5',
     component: 'Checkbox',
     label: '星期五',
     colProps: {
@@ -180,25 +181,25 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'startsOn',
+    field: 'startsOn5',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '开始时间选择',
     colProps: {
       span: 8,
     },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'endsOn',
+    field: 'endsOn5',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '结束时间选择',
     colProps: {
       span: 8,
     },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'daysOfWeek',
+    field: 'daysOfWeek6',
     component: 'Checkbox',
     label: '星期六',
     colProps: {
@@ -208,25 +209,25 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'startsOn',
+    field: 'startsOn6',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '开始时间选择',
     colProps: {
       span: 8,
     },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'endsOn',
+    field: 'endsOn6',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '结束时间选择',
     colProps: {
       span: 8,
     },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'daysOfWeek',
+    field: 'daysOfWeek7',
     component: 'Checkbox',
     label: '星期七',
     colProps: {
@@ -236,18 +237,18 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'startsOn',
+    field: 'startsOn7',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '开始时间选择',
     colProps: {
       span: 8,
     },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'schedule')),
   },
   {
-    field: 'endsOn',
+    field: 'endsOn7',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '结束时间选择',
     colProps: {
       span: 8,
     },
@@ -304,9 +305,9 @@ export const formSchema: FormSchema[] = [
   {
     field: 'startsOn',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '开始时间选择',
     colProps: {
-      span: 8,
+      span: 12,
     },
     componentProps: {
       valueFormat: 'HH:mm:ss',
@@ -316,9 +317,9 @@ export const formSchema: FormSchema[] = [
   {
     field: 'endsOn',
     component: 'TimePicker',
-    label: '时间选择',
+    label: '结束时间选择',
     colProps: {
-      span: 8,
+      span: 12,
     },
     componentProps: {
       valueFormat: 'HH:mm:ss',

@@ -92,10 +92,10 @@ export const step3Schemas: FormSchema[] = [
     field: 'alarmType',
     component: 'Input',
     label: '报警类型',
+    required: true,
     colProps: {
       span: 12,
     },
-    required: true,
     componentProps: {
       placeholder: '请输入报警类型',
     },
@@ -113,6 +113,9 @@ export const step3HighSetting: FormSchema[] = [
     field: 'propagateRelationTypes',
     component: 'Input',
     label: '关联类型',
+    colProps: {
+      span: 11,
+    },
     componentProps: {
       placeholder: '要传递的关联类型',
     },
@@ -127,6 +130,9 @@ export const step3CreateAlarm: FormSchema[] = [
     field: '',
     component: 'Select',
     label: '严重程度',
+    colProps: {
+      span: 16,
+    },
     componentProps: {
       placeholder: '请选择严重程度',
       options: [
@@ -174,13 +180,12 @@ export const dashboardFormScheme: FormSchema[] = [
     field: 'dashboardId',
     component: 'Select',
     label: 'Mobile dashboard:',
+    colProps: {
+      span: 15,
+    },
     componentProps: {
       placeholder: '请选择Mobile dashboard',
-      options: [
-        { label: 'DASHBOARD', value: 'DASHBOARD' },
-        { label: 'DASHBOARD1', value: 'DASHBOARD' },
-        { label: 'DASHBOARD2', value: 'DASHBOARD' },
-      ],
+      options: [{ label: 'DASHBOARD', value: 'DASHBOARD' }],
     },
   },
 ];
@@ -213,6 +218,47 @@ export const alertContactsSchemas: FormSchema[] = [
   },
 ];
 
+/**
+ * 所使用的枚举值
+ */
+
+export enum TriggerEnum {
+  IS_DEVICE_ACT = '属性',
+  IS_TIME_ACT = 'TIME_SERIES',
+  IS_SCENE_ACT = '常量',
+  IS_STRING = 'STRING',
+  IS_NUMERIC = 'NUMERIC',
+  IS_BOOLEAN = 'BOOLEAN',
+  IS_COMPLEX = 'COMPLEX',
+}
+
+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 isString = (type: string) => {
+  return type === TriggerEnum.IS_STRING;
+};
+
+export const isNumeric = (type: string) => {
+  return type === TriggerEnum.IS_NUMERIC;
+};
+
+export const isBoolean = (type: string) => {
+  return type === TriggerEnum.IS_BOOLEAN;
+};
+
+export const isComplex = (type: string) => {
+  return type === TriggerEnum.IS_COMPLEX;
+};
+
 export const echoFormSchema: FormSchema[] = [
   {
     field: 'type',
@@ -243,6 +289,7 @@ export const echoFormSchema: FormSchema[] = [
         { label: 'lastDisconnectTime', value: 'lastDisconnectTime' },
       ],
     },
+    ifShow: ({ values }) => isShiDu(Reflect.get(values, 'type')),
   },
   {
     field: 'key',
@@ -257,6 +304,7 @@ export const echoFormSchema: FormSchema[] = [
         { label: 'wet', value: 'wet' },
       ],
     },
+    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'type')),
   },
   {
     field: 'key',
@@ -266,6 +314,7 @@ export const echoFormSchema: FormSchema[] = [
     componentProps: {
       placeholder: '请输入键名',
     },
+    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'type')),
   },
   {
     field: 'type1',
@@ -298,6 +347,7 @@ export const echoFormSchema: FormSchema[] = [
         { label: '不包含', value: 'NOT_CONTAINS' },
       ],
     },
+    ifShow: ({ values }) => isString(Reflect.get(values, 'type1')),
   },
   {
     field: 'operation',
@@ -315,6 +365,7 @@ export const echoFormSchema: FormSchema[] = [
         { label: '小于或等于', value: 'LESS_OR_EQUAL' },
       ],
     },
+    ifShow: ({ values }) => isNumeric(Reflect.get(values, 'type1')),
   },
   {
     field: 'operation',
@@ -328,6 +379,7 @@ export const echoFormSchema: FormSchema[] = [
         { label: '不等于', value: 'NOT_EQUAL' },
       ],
     },
+    ifShow: ({ values }) => isBoolean(Reflect.get(values, 'type1')),
   },
   {
     field: 'operation',
@@ -345,6 +397,7 @@ export const echoFormSchema: FormSchema[] = [
         { label: '小于或等于', value: 'LESS_OR_EQUAL' },
       ],
     },
+    ifShow: ({ values }) => isComplex(Reflect.get(values, 'type1')),
   },
   {
     field: 'value1',

 <template>
   <div>
-    <PageWrapper title="修改当前用户密码" content="修改成功后会自动退出当前登录！" class="p-4">
+    <PageWrapper
+      title="第一次使用请修改当前用户密码，待修改完成后退出登录，才能使用本系统!"
+      content="修改成功后会自动退出当前登录！"
+      class="p-4"
+    >
       <div class="py-8 bg-white flex flex-col justify-center items-center">
         <BasicForm @register="register" />
         <div class="flex justify-center">

@@ -38,6 +38,7 @@
         },
         {
           field: 'username',
+          required: true,
           label: '账号',
           component: 'Input',
           dynamicRules: ({ values }) => {