Merge branch 'ft-dev' into 'main'

fix:修复登录界面后端返回的错误信息，feat:个人中心接口联调，fix:待修复设备配置个别字段回显问题

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

+import { UploadApiResult } from './model/uploadModel';
+import { IPutPersonal } from './model/index';
+import { defHttp } from '/@/utils/http/axios';
+import { UploadFileParams } from '/#/axios';
+
+enum API {
+  BaseUploadUrl = '/api/yt/oss/upload',
+  PutPersonalUrl = '/user/center',
+  GetPersonalUrl = '/user/',
+}
+/**
+ * @description: Upload interface
+ */
+export const uploadApi = (
+  params: UploadFileParams,
+  onUploadProgress: (progressEvent: ProgressEvent) => void
+) => {
+  return defHttp.uploadFile<UploadApiResult>(
+    {
+      url: API.BaseUploadUrl,
+      onUploadProgress,
+    },
+    params
+  );
+};
+
+export const personalGet = (id: string) => {
+  return defHttp.get({
+    url: `${API.GetPersonalUrl}${id}`,
+  });
+};
+
+export const personalPut = (params: IPutPersonal) => {
+  return defHttp.put<IPutPersonal>({
+    url: API.PutPersonalUrl,
+    params,
+  });
+};

+export interface FileUploadResponse {
+  fileName: string;
+  fileDownloadUri: string;
+  fileType: string;
+  size: number;
+  fileStaticUri: string;
+}
+
+export interface IPutPersonal {
+  accountExpireTime?: string;
+  activateToken?: string;
+  avatar?: string;
+  createTime?: string;
+  creator?: string;
+  deptId?: string;
+  email?: string;
+  enabled?: true;
+  hasPassword?: true;
+  id?: string;
+  level?: 0;
+  organizationIds?: [string];
+  password?: string;
+  phoneNumber?: string;
+  realName?: string;
+  roleIds?: [string];
+  roles?: [
+    {
+      roleId: string;
+      roleName: string;
+    }
+  ];
+  tenantId?: string;
+  tenantName?: string;
+  updateTime?: string;
+  updater?: string;
+  userStatusEnum?: string;
+  username?: string;
+}

+export interface UploadApiResult {
+  message: string;
+  code: number;
+  url: string;
+}

@@ -91,7 +91,7 @@
         }
       );
 
-      function handleUploadSuccess({ source }) {
+      function handleUploadSuccess(source) {
         sourceValue.value = source;
         emit('change', source);
         createMessage.success(t('component.cropper.uploadSuccess'));

@@ -2,9 +2,9 @@ import { FormSchema } from '/@/components/Table';
 
 export const formSchema: FormSchema[] = [
   {
-    field: 'name',
+    field: 'nickName',
     label: '用户昵称',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     required: true,
     component: 'Input',
     componentProps: {
@@ -12,9 +12,9 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'phone',
+    field: 'phoneNumber',
     label: '手机号码',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     required: true,
     component: 'Input',
     componentProps: {
@@ -24,31 +24,11 @@ export const formSchema: FormSchema[] = [
   {
     field: 'email',
     label: '邮箱',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     required: true,
     component: 'Input',
     componentProps: {
       placeholder: '请输入邮箱',
     },
   },
-  {
-    field: 'sex',
-    component: 'RadioGroup',
-    label: '性别',
-    colProps: {
-      span: 24,
-    },
-    componentProps: {
-      options: [
-        {
-          label: '男',
-          value: 'male',
-        },
-        {
-          label: '女',
-          value: 'female',
-        },
-      ],
-    },
-  },
 ];

 <template>
   <BasicModal
     :useWrapper="true"
-    width="65rem"
+    width="80vw"
+    :height="compHeight"
     v-bind="$attrs"
     @register="registerModal"
     @ok="handleSubmit"
   >
     <div
       style="
-        margin-top: -20px;
-        width: 100vw;
-        height: 50vh;
+        height: 62vh;
+        width: 120vw;
         display: flex;
         flex-direction: row;
         align-items: center;
         justify-content: space-between;
       "
     >
-      <div style="width: 30vw; height: 20vh">
-        <p>个人信息</p>
-        <div class="change-avatar">
+      <div style="width: 29vw; height: 62vh; border: 1px solid #e9edf6; box-shadow: 0 0 5px -5px">
+        <div style="width: 29vw; height: 4vh; border: 1px solid #e9edf6"
+          ><p style="font-size: 17px; margin-top: 7px; margin-left: 10px">个人信息</p></div
+        >
+        <div class="change-avatar" style="text-align: center">
           <div class="mb-2">头像</div>
           <CropperAvatar
+            :uploadApi="uploadApi"
             :value="avatar"
             btnText="更换头像"
             :btnProps="{ preIcon: 'ant-design:cloud-upload-outlined' }"
@@ -30,106 +33,137 @@
           />
         </div>
         <Description
-          class="mt-4"
-          layout="vertical"
-          :collapseOptions="{ canExpand: true, helpMessage: 'help me' }"
-          :column="2"
+          class="mt-8"
+          :column="1"
           :schema="schema"
-          :data="descData"
+          :bordered="true"
+          :data="getPersonalDetailValue"
           @register="registerDesc"
         />
       </div>
-      <div style="width: 70vw; height: 20vh">
-        <p>基本资料</p>
-        <BasicForm @register="registerForm" />
+      <div
+        style="
+          width: 90vw;
+          height: 60vh;
+          border: 1px solid #e9edf6;
+          margin-top: -15px;
+          box-shadow: 0 0 5px -5px;
+        "
+      >
+        <div style="width: 90vw; height: 4vh; border: 1px solid #e9edf6"
+          ><p style="font-size: 17px; margin-top: 7px; margin-left: 20px">基本资料</p></div
+        >
+        <div style="margin-left: 20px">
+          <BasicForm @register="registerForm" />
+        </div>
       </div>
     </div>
   </BasicModal>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed } from 'vue';
+  import { defineComponent, ref, computed, onMounted } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './config';
   import { Description, DescItem, useDescription } from '/@/components/Description/index';
   import { CropperAvatar } from '/@/components/Cropper';
   import defaultImage from '/@/assets/images/logo.png';
+  import { uploadApi, personalPut } from '/@/api/personal/index';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
+  import { useUserStore } from '/@/store/modules/user';
 
   const schema: DescItem[] = [
     {
-      field: 'name',
-      label: '用户名称',
+      field: 'username',
+      label: '用户名称：',
     },
     {
-      field: 'phone',
-      label: '手机号码',
-      render: (curVal, data) => {
-        return `${data.username}-${curVal}`;
-      },
+      field: 'phoneNumber',
+      label: '手机号码：',
     },
     {
       field: 'email',
-      label: '用户邮箱',
+      label: '用户邮箱：',
     },
     {
-      field: 'name1',
-      label: '用户昵称',
+      field: 'realName',
+      label: '用户昵称：',
     },
     {
-      field: 'timeout',
-      label: '过期时间',
+      field: 'accountExpireTime',
+      label: '过期时间：',
     },
     {
       field: 'createTime',
-      label: '创建时间',
+      label: '创建时间：',
     },
   ];
-
-  const descData = {
-    name: '测试',
-    phone: 'xxxx',
-    email: 'dddddd',
-    name1: 'ddd',
-    timeout: '2021-90=90',
-    createTime: '2021-90=90',
-  };
-
   export default defineComponent({
     name: 'index',
     components: { BasicModal, BasicForm, Description, CropperAvatar },
     setup() {
+      const userStore = useUserStore();
+      const userInfo = getAuthCache(USER_INFO_KEY);
+      const { createMessage } = useMessage();
       const getPersonalValue: any = ref({});
+      const getPersonalDetailValue: any = ref({});
+      const avatarUrl: any = ref('');
+      const getBackendV: any = ref({});
       const [registerDesc] = useDescription({
         title: '个人详情',
         schema: schema,
       });
 
-      const [registerModal] = useModalInner();
-      const [registerForm, { validate }] = useForm({
+      const [registerModal, { closeModal }] = useModalInner();
+      const [registerForm, { validate, resetFields }] = useForm({
         showActionButtonGroup: false,
         schemas: formSchema,
       });
       const avatar = computed(() => {
-        //     :uploadApi="uploadApi"
-        // const { avatar } = userStore.getUserInfo;
-        return defaultImage;
+        const { avatar } = userStore.getUserInfo;
+        return avatar || defaultImage;
       });
       const handleSubmit = async () => {
+        // console.log(userStore.getUserInfo);
+        const getUserInfo = await userInfo;
+        // console.log(getUserInfo);
         getPersonalValue.value = await validate();
-        console.log(getPersonalValue.value);
-        //TODO 后端接口
+        getPersonalValue.value.id = getUserInfo.userId;
+        getPersonalValue.value.username = getBackendV.value.username;
+        getPersonalValue.value.avatar = avatarUrl.value;
+        await personalPut(getPersonalValue.value);
+        createMessage.success('修改成功');
+        closeModal();
+        resetFields();
       };
-      const updateAvatar = (src: string) => {
-        console.log('src' + src);
-        // const userinfo = userStore.getUserInfo;
-        // userinfo.avatar = src;
-        // userStore.setUserInfo(userinfo);
+      const updateAvatar = async (v) => {
+        avatarUrl.value = v.data.fileStaticUri;
+        console.log(avatarUrl.value);
+        // await personalPut({ avatar: v });
       };
+      const getPersonalDetail = async () => {
+        try {
+          const getUserInfo = await userInfo;
+          getPersonalDetailValue.value = getUserInfo;
+        } catch (e) {
+          return e;
+        }
+      };
+      onMounted(async () => {
+        getPersonalDetail();
+      });
+      const compHeight = computed(() => {
+        return 1000;
+      });
       return {
+        uploadApi,
+        compHeight,
         updateAvatar,
         avatar,
         handleSubmit,
-        descData,
+        getPersonalDetailValue,
         registerDesc,
         schema,
         registerModal,

@@ -32,7 +32,7 @@
         <MenuItem
           key="personal"
           :text="t('layout.header.dropdownItemPersonal')"
-          icon="ion:power-outline"
+          icon="ion:build-outlined"
         />
       </Menu>
     </template>
@@ -121,7 +121,9 @@
       }
 
       const openPersonalFunc = () => {
-        openModalPersonal(true);
+        setTimeout(() => {
+          openModalPersonal(true);
+        }, 10);
       };
 
       return {

@@ -129,6 +129,7 @@ export const useUserStore = defineStore({
       try {
         const { goHome = true, mode, ...loginParams } = params;
         const data = await loginApi(loginParams, mode);
+        console.log(data);
         return this.process(data, goHome);
       } catch (error) {
         return Promise.reject(error);

@@ -15,18 +15,53 @@ import { setObjToUrlParams, deepMerge } from '/@/utils';
 import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { joinTimestamp, formatRequestDate } from './helper';
-// import { PageEnum } from '/@/enums/pageEnum';
+import { PageEnum } from '/@/enums/pageEnum';
 import { REFRESH_TOKEN_KEY } from '/@/enums/cacheEnum';
 import { router } from '/@/router';
+
 // import { useUserStore } from '/@/store/modules/user';
 // const userStore = useUserStore();
 // console.log(userStore.userInfo);
 
 // YUNTENG IOT__DEVELOPMENT__2.7.1__COMMON__LOCAL__KEY__
+
+function timestampToTime(timestamp) {
+  const date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+  const Y = date.getFullYear() + '-';
+  const M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+  const D = date.getDate() + ' ';
+  const h = date.getHours() + ':';
+  const m = date.getMinutes() + ':';
+  const s = date.getSeconds();
+  return Y + M + D + h + m + s;
+}
+
+function convertToDate() {
+  const date = new Date();
+  const y = date.getFullYear();
+  let m = date.getMonth() + 1;
+  let d = date.getDate();
+  let h = date.getHours();
+  let min = date.getMinutes();
+  let s = date.getSeconds();
+  m = m < 10 ? '0' + m : m; //月小于10，加0
+  d = d < 10 ? '0' + d : d; //day小于10，加0
+  h = h < 10 ? '0' + h : h;
+  min = min < 10 ? '0' + min : min;
+  s = s < 10 ? '0' + s : s;
+  return y + '-' + m + '-' + d + ' ' + h + ':' + min + ':' + s;
+}
+
 const globSetting = useGlobSetting();
 const urlPrefix = globSetting.urlPrefix;
 const { createMessage, createErrorModal } = useMessage();
 const getJwtTokenInfo = getAuthCache(REFRESH_TOKEN_KEY);
+const getExiper = window.localStorage.getItem(
+  'UNDEFINED__DEVELOPMENT__2.7.1__COMMON__LOCAL__KEY__'
+);
+const getExiperValue = JSON.parse(getExiper);
+const expireTime = timestampToTime(getExiperValue.expire);
+const nowTime = convertToDate();
 
 /**
  * @description: 数据处理，方便区分多种处理方式
@@ -130,16 +165,25 @@ const transform: AxiosTransform = {
 
     try {
       if (response.data.code === '401' || response.data.msg === 'tenant has expired') {
-        createMessage.error('token已过期,退回登录');
-        // router.push(PageEnum.BASE_LOGIN);
-        router.beforeEach((to, from, next) => {
-          if (getJwtTokenInfo) {
-            if (to.path === '/login' || to.path !== '/login') {
-              // doRefresh();
-              next({ path: '/' });
-            }
+        if (expireTime < nowTime) {
+          // console.log('过期');
+          createMessage.error('token已经过期,请退回登录');
+        } else {
+          // console.log('未过期');
+        }
+        if (getJwtTokenInfo) {
+          if (PageEnum.BASE_LOGIN) {
+            router.push(PageEnum.BASE_LOGIN);
           }
-        });
+        }
+        // router.beforeEach((to, from, next) => {
+        //   if (getJwtTokenInfo) {
+        //     if (to.path !== '/login') {
+        //       // doRefresh();
+        //       next({ path: '/' });
+        //     }
+        //   }
+        // });
       } else {
         // doRefresh();
       }

@@ -78,12 +78,12 @@
     step3ViewHighSetting,
     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';
+  import { formSchema as echoFormSchema } from './step/cpns/alarmruleconditions/cpns/config';
 
   export default defineComponent({
     name: 'ConfigDrawer',
@@ -162,86 +162,73 @@
         descInfo.value = await deviceConfigGetDetail(data.record.id);
         try {
           await setRegisterDetail({ ...descInfo.value });
-          // await setRegisterTrans({
-          //   transportType: descInfo.value.profileData.transportConfiguration.type,
-          // });
-          // await setRegisterStep3Schemas({
-          //   alarmType: descInfo.value.profileData.alarms[0].alarmType,
-          // });
-          // await setRegisterStep3HighSetting({
-          //   propagate: descInfo.value.profileData.alarms[0].propagate,
-          //   propagateRelationTypes: descInfo.value.profileData.alarms[0].propagateRelationTypes[0],
-          // });
-          // await setRegisterStep3CreateAlarm({ ...descInfo.value });
-          // await setRegisterStep3RuleAlarm({ ...descInfo.value });
-          // await setRegisterContact({ ...descInfo.value });
-          // await setRegisterStep3Condition({ ...descInfo.value });
-          // await setRegisterStep3Enable({ ...descInfo.value });
-          // await setRegisterStep3TemplateDetail({ ...descInfo.value });
         } catch (e) {
           return e;
         }
       });
       const handleChange = (v) => {
-        switch (v) {
-          case '1':
-            setRegisterDetail({ ...descInfo.value });
-            break;
-          case '2':
-            setRegisterTrans({
-              transportType: descInfo.value.profileData?.transportConfiguration.type,
-            });
-            break;
-          case '3':
-            setRegisterStep3Schemas({
-              alarmType: descInfo.value.profileData?.alarms[0].alarmType,
-            });
-            setRegisterStep3HighSetting({
-              propagate: descInfo.value.profileData?.alarms[0].propagate,
-              propagateRelationTypes: descInfo.value.profileData?.alarms[0].propagateRelationTypes,
-            });
-            const getKey = Object.keys(descInfo.value.profileData?.alarms[0].createRules);
-            console.log(descInfo.value.profileData?.alarms[0].createRules[getKey[0]]);
-            // console.log(descInfo.value.profileData.alarms[0].createRules.MAJOR);
-            // console.log(descInfo.value.profileData.alarms[0].createRules['MAJOR']);
-            setRegisterStep3CreateAlarm({
-              WARNING: descInfo.value.profileData?.alarms[0].createRules[getKey[0]],
-            });
-            setRegisterStep3RuleAlarm({
-              type: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
-                .condition[0].key.type,
-              key: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
-                .condition[0].key.key,
-              valueType:
-                descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition.condition[0]
-                  .valueType,
-              value:
-                descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition.condition[0]
-                  .value,
-              predicate:
-                descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition.condition[0]
-                  .predicate,
-            });
-            setRegisterStep3Condition({
-              conditionType:
-                descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition.spec.type,
-            });
-            setRegisterStep3Enable({
-              schedule: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].schedule,
-            });
-            setRegisterStep3TemplateDetail({
-              alarmDetails:
-                descInfo.value.profileData?.alarms[0].createRules[getKey[0]].alarmDetails,
-            });
-            break;
-          case '4':
-            setRegisterContact({
-              alarmContactId: descInfo.value.alarmProfile.alarmContactId,
-              messageMode: descInfo.value.alarmProfile.messageMode,
-            });
-            break;
+        try {
+          switch (v) {
+            case '1':
+              setRegisterDetail({ ...descInfo.value });
+              break;
+            case '2':
+              setRegisterTrans({
+                transportType: descInfo.value.profileData?.transportConfiguration.type,
+              });
+              break;
+            case '3':
+              setRegisterStep3Schemas({
+                alarmType: descInfo.value.profileData?.alarms[0].alarmType,
+              });
+              setRegisterStep3HighSetting({
+                propagate: descInfo.value.profileData?.alarms[0].propagate,
+                propagateRelationTypes:
+                  descInfo.value.profileData?.alarms[0].propagateRelationTypes,
+              });
+              const getKey = Object.keys(descInfo.value.profileData?.alarms[0].createRules);
+              setRegisterStep3CreateAlarm({
+                default: getKey[0],
+              });
+              setRegisterStep3RuleAlarm({
+                type: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                  .condition[0].key.type,
+                key: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                  .condition[0].key.key,
+                valueType:
+                  descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                    .condition[0].valueType,
+                value:
+                  descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                    .condition[0].value,
+                operation:
+                  descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                    .condition[0].predicate.operation,
+              });
+              setRegisterStep3Condition({
+                conditionType:
+                  descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition.spec.type,
+              });
+              setRegisterStep3Enable({
+                schedule: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].schedule,
+              });
+              setRegisterStep3TemplateDetail({
+                alarmDetails:
+                  descInfo.value.profileData?.alarms[0].createRules[getKey[0]].alarmDetails,
+              });
+              break;
+            case '4':
+              setRegisterContact({
+                alarmContactId: descInfo.value.alarmProfile.alarmContactId,
+                messageMode: descInfo.value.alarmProfile.messageMode,
+              });
+              break;
+          }
+        } catch (e) {
+          return e;
         }
       };
+
       watch(
         () => activeKey.value,
         (v) => {

-{
-    "name": "测试abcd",
-    "defaultRuleChainId": "354c7210-5d97-11ec-8ac9-f38ed935ea2a",
-    "defaultQueueName": "HighPriority",
-    "description": "测试abcd",
-    "transportType": "DEFAULT",
-    "profileData": {
-        "alarms": [
-            {
-                "alarmType": "测试abcd",
-                "propagate": true,
-                "propagateRelationTypes": [
-                    "测试abcd"
-                ],
-                "createRules": {
-                    "MAJOR": {
-                        "alarmDetails": "测试abcd",
-                        "schedule": {
-                            "type": "ANY_TIME"
-                        },
-                        "condition": {
-                            "condition": [
-                                {
-                                    "key": {
-                                        "type": "TIME_SERIES",
-                                        "key": "temp"
-                                    },
-                                    "valueType": "NUMERIC",
-                                    "predicate": {
-                                        "operation": "EQUAL",
-                                        "value": {
-                                            "defaultValue": 1
-                                        },
-                                        "type": "NUMERIC"
-                                    }
-                                }
-                            ],
-                            "spec": {
-                                "type": "SIMPLE"
-                            }
-                        }
-                    }
-                },
-                "clearRule": {
-                    "alarmDetails": "测",
-                    "schedule": {
-                        "type": "ANY_TIME"
-                    },
-                    "condition": {
-                        "condition": [
-                            {
-                                "key": {
-                                    "type": "TIME_SERIES",
-                                    "key": "CO2"
-                                },
-                                "valueType": "NUMERIC",
-                                "predicate": {
-                                    "operation": "NOT_EQUAL",
-                                    "value": {
-                                        "defaultValue": 2
-                                    },
-                                    "type": "NUMERIC"
-                                }
-                            }
-                        ],
-                        "spec": {
-                            "type": "SIMPLE"
-                        }
-                    }
-                },
-                "id": "4e299769-24d1-4cef-91ad-f206f5fb234b"
-            }
-        ]
-    },
-    "alarmProfile": {
-        "alarmContactId": "a3004ddd-db8f-487c-aea0-4f6f3efc59a9",
-        "messageMode": "EMAIL_MESSAGE"
-    }
-}
\ No newline at end of file

@@ -3,7 +3,7 @@
     <template v-for="(item, index) in profileData" :key="item.id">
       <CollapseContainer class="border mb-1" :canExpan="false">
         <template #action>
-          <div @click="deleteAlarmRule(index)" class="cursor-pointer">
+          <div class="cursor-pointer">
             <img
               style="cursor: pointer"
               @click="deleteAlarmRule(index)"
@@ -78,7 +78,7 @@
         <div style="height: 20px"></div>
         <p>清除报警规则</p>
         <template
-          v-for="(childClearItem, createIndex) in item.alarms[0].clearRule"
+          v-for="(childClearItem, clearIndexItem) in item.alarms[clearIndex].clearRule"
           :key="childClearItem.id"
         >
           <div class="aic mb-1" style="border: 1px solid #bfbfbf">
@@ -176,13 +176,7 @@
     dashboardFormScheme,
     isWhereType,
   } from './data';
-  import {
-    DeleteOutlined,
-    // MinusCircleOutlined,
-    PlusCircleOutlined,
-    PlusOutlined,
-    EditOutlined,
-  } from '@ant-design/icons-vue';
+  import { PlusCircleOutlined } from '@ant-design/icons-vue';
   import { Checkbox } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
   import DetailTemplate from './cpns/detailtemplate/index.vue';
@@ -190,17 +184,14 @@
   import AlarmRuleConditions from './cpns/alarmruleconditions/index.vue';
   import { Button } from '/@/components/Button';
 
+  export const isWhereTypeValueDisabled = ref(false);
+
   export default defineComponent({
     components: {
       BasicForm,
       CollapseContainer,
-      DeleteOutlined,
-      // MinusCircleOutlined,
       PlusCircleOutlined,
-      PlusOutlined,
-      EditOutlined,
       Checkbox,
-      // Tooltip,
       DetailTemplate,
       EnableRule,
       AlarmRuleConditions,
@@ -231,12 +222,13 @@
       const ruleClearTemplateData: any = ref(null);
       const enableClearTemplateData: any = ref(null);
       const detailClearTemplateData: any = ref(null);
+      const clearIndex = ref(-1);
       //告警列表
       let profileData = ref<IProfileData[]>([]);
       const log = (e) => {
         console.log(e);
       };
-      // 添加和删除告警配置
+      //删除告警配置
       const deleteAlarmRule = (index: number) => {
         unref(profileData).splice(index, 1);
       };
@@ -244,8 +236,9 @@
       const prevStep = () => {
         emit('prev');
       };
-
+      //添加报警规则
       const addAlarmRule = () => {
+        clearIndex.value++;
         unref(profileData).push({
           configuration: {
             type: '',
@@ -328,6 +321,7 @@
           setFieldsValue: setRegisterFormCreateAlarm,
           resetFields: resetRegisterFormCreateAlarm,
           validate: validateRegisterFormCreateAlarm,
+          updateSchema,
         },
       ] = useForm({
         labelWidth: 120,
@@ -358,8 +352,55 @@
       const retryRegisterFormCreateAlarmFunc = (v) => {
         setRegisterFormCreateAlarm(v);
       };
+      const tempValue1: string = ref<string>('');
       // 添加‘创建条件’
       const addCreateRole = (index: number) => {
+        updateSchema({
+          field: 'default',
+          componentProps: ({ formModel }) => {
+            if (formModel.default == 'CRITICAL') {
+              tempValue1.value = formModel.default;
+            } else if (formModel.default == 'MAJOR') {
+              tempValue1.value = formModel.default;
+            } else if (formModel.default == 'MINOR') {
+              tempValue1.value = formModel.default;
+            } else if (formModel.default == 'WARNING') {
+              tempValue1.value = formModel.default;
+            } else if (formModel.default == 'INDETERMINATE') {
+              tempValue1.value = formModel.default;
+            }
+            return {
+              options: [
+                {
+                  value: 'CRITICAL',
+                  label: '危险',
+                  disabled: tempValue1.value == 'CRITICAL',
+                },
+                {
+                  value: 'MAJOR',
+                  label: '重要',
+                  disabled: tempValue1.value == 'MAJOR',
+                },
+                {
+                  value: 'MINOR',
+                  label: '次要',
+                  disabled: tempValue1.value == 'MINOR',
+                },
+                {
+                  value: 'WARNING',
+                  label: '警告',
+                  disabled: tempValue1.value == 'WARNING',
+                },
+                {
+                  value: 'INDETERMINATE',
+                  label: '不确定',
+                  disabled: tempValue1.value == 'INDETERMINATE',
+                },
+              ],
+            };
+          },
+        });
+
         unref(profileData)[index].alarms.push({
           id: Date.now() + Math.random() + '',
           alarmType: '',
@@ -390,13 +431,18 @@
       };
       watch(isWhereType, (nV) => {
         isWhereTypeValue.value = nV;
+        if (isWhereTypeValue.value == nV) {
+          isWhereTypeValueDisabled.value = true;
+        } else {
+          // isWhereTypeValueDisabled.value = false;
+        }
       });
       //详情模板
       const getAllFieldsFunc = (v) => {
         detailObj.value = v;
         detailTemplateData.value = `
-         报警详细信息:${v.alarmDetails}
-         `;
+           报警详细信息:${v.alarmDetails}
+           `;
       };
       //启用规则
       const getAllFieldsEnabFunc = (v) => {
@@ -440,10 +486,12 @@
             console.log(e);
           }
         });
-
-        enableTemplateData.value = `
-         开始时间:${v.startsOn}结束时间:${v.endsOn}天数:${findDayByValue}
-         `;
+        enableTemplateData.value =
+          v.startsOn == undefined
+            ? `始终启用`
+            : `
+           开始时间:${v.startsOn},结束时间:${v.endsOn},天数:${findDayByValue}
+           `;
       };
       //规则条件
       const getAllFieldsRuleFunc = (v, v1) => {
@@ -468,8 +516,8 @@
           }
         });
         ruleTemplateData.value = `
-         键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
-         `;
+           键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
+           `;
 
         ruleLastObj.value = v1;
         const predicate = {
@@ -514,8 +562,8 @@
       const getAllClearFieldsFunc = (v) => {
         detailClearObj.value = v;
         detailClearTemplateData.value = `
-         报警详细信息:${v.alarmDetails}
-         `;
+           报警详细信息:${v.alarmDetails}
+           `;
       };
       //启用规则
       const getAllClearFieldsEnabFunc = (v) => {
@@ -559,9 +607,11 @@
             console.log(e);
           }
         });
-        enableClearTemplateData.value = `
-         开始时间:${v.startsOn}结束时间:${v.endsOn}天数:${findDayByValue}
-         `;
+        enableClearTemplateData.value =
+          v.startsOn == undefined
+            ? `始终启用`
+            : `开始时间:${v.startsOn},结束时间:${v.endsOn},天数:${findDayByValue}
+           `;
       };
       //规则条件
       const getAllClearFieldsRuleFunc = (v, v1) => {
@@ -586,8 +636,8 @@
           }
         });
         ruleClearTemplateData.value = `
-         键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
-         `;
+           键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
+           `;
 
         ruleLastObj.value = v1;
         const predicate = {
@@ -762,7 +812,9 @@
           proxy.$refs.getChildData3.resetDataFunc();
         }, 50);
       };
+
       return {
+        clearIndex,
         retryRegisterFormFunc,
         retryRegisterFormHighSettingmFunc,
         retryRegisterFormCreateAlarmFunc,

@@ -28,6 +28,7 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 12 },
     required: true,
     component: 'Select',
+    defaultValue: 'ANY_TIME',
     componentProps: {
       placeholder: '请选择报警日程表',
       options: [

@@ -146,39 +146,41 @@ export const isWhereType = ref(null);
 
 export const step3CreateAlarm: FormSchema[] = [
   {
-    field: 'WARNING',
+    field: 'default',
     component: 'Select',
     label: '严重程度',
     colProps: {
       span: 16,
     },
-    componentProps: {
-      placeholder: '请选择严重程度',
-      options: [
-        {
-          value: 'CRITICAL',
-          label: '危险',
-        },
-        {
-          value: 'MAJOR',
-          label: '重要',
-        },
-        {
-          value: 'MINOR',
-          label: '次要',
-        },
-        {
-          value: 'WARNING',
-          label: '警告',
-        },
-        {
-          value: 'INDETERMINATE',
-          label: '不确定',
+    componentProps({ formModel }) {
+      return {
+        placeholder: '请选择严重程度',
+        options: [
+          {
+            value: 'CRITICAL',
+            label: '危险',
+          },
+          {
+            value: 'MAJOR',
+            label: '重要',
+          },
+          {
+            value: 'MINOR',
+            label: '次要',
+          },
+          {
+            value: 'WARNING',
+            label: '警告',
+          },
+          {
+            value: 'INDETERMINATE',
+            label: '不确定',
+          },
+        ],
+        onChange: (v) => {
+          isWhereType.value = v ? v : 'INDETERMINATE';
         },
-      ],
-      onChange: (v) => {
-        isWhereType.value = v ? v : 'INDETERMINATE';
-      },
+      };
     },
   },
 ];
@@ -236,195 +238,3 @@ 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',
-    label: '键类型',
-    colProps: { span: 24 },
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择键类型',
-      options: [
-        { label: '属性', value: '属性' },
-        { label: 'Timeseries', value: 'TIME_SERIES' },
-        { label: '常量', value: '常量' },
-      ],
-    },
-  },
-  {
-    field: 'key',
-    label: '键名',
-    colProps: { span: 24 },
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择键名',
-      options: [
-        { label: 'active', value: 'active' },
-        { label: 'inactivityAlarmTime', value: 'inactivityAlarmTime' },
-        { label: 'lastActivityTime', value: 'lastActivityTime' },
-        { label: 'lastConnectTime', value: 'lastConnectTime' },
-        { label: 'lastDisconnectTime', value: 'lastDisconnectTime' },
-      ],
-    },
-    ifShow: ({ values }) => isShiDu(Reflect.get(values, 'type')),
-  },
-  {
-    field: 'key',
-    label: '键名',
-    colProps: { span: 24 },
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择键名',
-      options: [
-        { label: 'CO2', value: 'CO2' },
-        { label: 'temp', value: 'temp' },
-        { label: 'wet', value: 'wet' },
-      ],
-    },
-    ifShow: ({ values }) => isWenDu(Reflect.get(values, 'type')),
-  },
-  {
-    field: 'key',
-    label: '键名',
-    colProps: { span: 24 },
-    component: 'Input',
-    componentProps: {
-      placeholder: '请输入键名',
-    },
-    ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'type')),
-  },
-  {
-    field: 'type1',
-    label: '值类型',
-    colProps: { span: 24 },
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择值类型',
-      options: [
-        { label: '字符串', value: 'STRING' },
-        { label: '数字', value: 'NUMERIC' },
-        { label: '布尔值', value: 'BOOLEAN' },
-        { label: '日期时间', value: 'COMPLEX' },
-      ],
-    },
-  },
-  {
-    field: 'operation',
-    label: '操作',
-    colProps: { span: 24 },
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择操作',
-      options: [
-        { label: '等于', value: 'EQUAL' },
-        { label: '不等于', value: 'NOT_EQUAL' },
-        { label: '开始于', value: 'STARTS_WITH' },
-        { label: '结束于', value: 'ENDS_WITH' },
-        { label: '包含', value: 'CONTAINS' },
-        { label: '不包含', value: 'NOT_CONTAINS' },
-      ],
-    },
-    ifShow: ({ values }) => isString(Reflect.get(values, 'type1')),
-  },
-  {
-    field: 'operation',
-    label: '操作',
-    colProps: { span: 24 },
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择操作',
-      options: [
-        { label: '等于', value: 'EQUAL' },
-        { label: '不等于', value: 'NOT_EQUAL' },
-        { label: '大于', value: 'GREATER' },
-        { label: '小于', value: 'LESS' },
-        { label: '大于或等于', value: 'GREATER_OR_EQUAL' },
-        { label: '小于或等于', value: 'LESS_OR_EQUAL' },
-      ],
-    },
-    ifShow: ({ values }) => isNumeric(Reflect.get(values, 'type1')),
-  },
-  {
-    field: 'operation',
-    label: '操作',
-    colProps: { span: 24 },
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择操作',
-      options: [
-        { label: '等于', value: 'EQUAL' },
-        { label: '不等于', value: 'NOT_EQUAL' },
-      ],
-    },
-    ifShow: ({ values }) => isBoolean(Reflect.get(values, 'type1')),
-  },
-  {
-    field: 'operation',
-    label: '操作',
-    colProps: { span: 24 },
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择操作',
-      options: [
-        { label: '等于', value: 'EQUAL' },
-        { label: '不等于', value: 'NOT_EQUAL' },
-        { label: '大于', value: 'GREATER' },
-        { label: '小于', value: 'LESS' },
-        { label: '大于或等于', value: 'GREATER_OR_EQUAL' },
-        { label: '小于或等于', value: 'LESS_OR_EQUAL' },
-      ],
-    },
-    ifShow: ({ values }) => isComplex(Reflect.get(values, 'type1')),
-  },
-  {
-    field: 'value1',
-    label: '默认值',
-    colProps: { span: 24 },
-    component: 'Input',
-    componentProps: {
-      placeholder: '请输入默认值(数字)',
-    },
-  },
-];

@@ -133,7 +133,7 @@
         title: t('sys.api.loginFailed'),
         content:
           error.response && error.response.status == 401
-            ? t('sys.api.passwordOrUserNameError')
+            ? error.response.data.message
             : error.code == 'ECONNABORTED'
             ? t('sys.api.timeoutMessage')
             : t('sys.api.apiRequestFailed'),