fix:修复profileData的id

+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',
+  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.post<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;
+}

@@ -2,9 +2,9 @@ import { FormSchema } from '/@/components/Table';
 
 export const formSchema: FormSchema[] = [
   {
-    field: 'name',
+    field: 'creator',
     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,7 +24,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'email',
     label: '邮箱',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     required: true,
     component: 'Input',
     componentProps: {
@@ -32,21 +32,21 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'sex',
+    field: 'enabled',
     component: 'RadioGroup',
     label: '性别',
     colProps: {
-      span: 24,
+      span: 13,
     },
     componentProps: {
       options: [
         {
           label: '男',
-          value: 'male',
+          value: 'true',
         },
         {
           label: '女',
-          value: 'female',
+          value: 'false',
         },
       ],
     },

 <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,75 +33,80 @@
           />
         </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, personalGet } from '/@/api/personal/index';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
 
   const schema: DescItem[] = [
     {
-      field: 'name',
-      label: '用户名称',
+      field: 'creator',
+      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: 'createTime',
+      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 userInfo = getAuthCache(USER_INFO_KEY);
+      const { createMessage } = useMessage();
       const getPersonalValue: any = ref({});
+      const getPersonalDetailValue: any = ref({});
       const [registerDesc] = useDescription({
         title: '个人详情',
         schema: schema,
@@ -110,26 +118,40 @@
         schemas: formSchema,
       });
       const avatar = computed(() => {
-        //     :uploadApi="uploadApi"
-        // const { avatar } = userStore.getUserInfo;
         return defaultImage;
       });
       const handleSubmit = async () => {
         getPersonalValue.value = await validate();
-        console.log(getPersonalValue.value);
-        //TODO 后端接口
+        await personalPut(getPersonalValue.value);
+        createMessage.success('修改成功');
       };
-      const updateAvatar = (src: string) => {
-        console.log('src' + src);
-        // const userinfo = userStore.getUserInfo;
-        // userinfo.avatar = src;
-        // userStore.setUserInfo(userinfo);
+      const updateAvatar = async (v) => {
+        console.log('v' + v);
+        await personalPut({ avatar: v });
       };
+      const getPersonalDetail = async () => {
+        try {
+          const getUserInfo = await userInfo;
+          const getBackendData = await personalGet(getUserInfo.userId);
+          getPersonalDetailValue.value = getBackendData;
+          console.log(getPersonalDetailValue.value);
+        } catch (e) {
+          return e;
+        }
+      };
+      onMounted(() => {
+        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 {

-{
-    "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

@@ -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,
@@ -390,13 +381,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 +436,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 +466,8 @@
           }
         });
         ruleTemplateData.value = `
-         键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
-         `;
+           键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
+           `;
 
         ruleLastObj.value = v1;
         const predicate = {
@@ -514,8 +512,8 @@
       const getAllClearFieldsFunc = (v) => {
         detailClearObj.value = v;
         detailClearTemplateData.value = `
-         报警详细信息:${v.alarmDetails}
-         `;
+           报警详细信息:${v.alarmDetails}
+           `;
       };
       //启用规则
       const getAllClearFieldsEnabFunc = (v) => {
@@ -559,9 +557,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 +586,8 @@
           }
         });
         ruleClearTemplateData.value = `
-         键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
-         `;
+           键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
+           `;
 
         ruleLastObj.value = v1;
         const predicate = {

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

@@ -5,6 +5,7 @@ import { deviceConfigGetRuleChain } from '/@/api/device/deviceConfigApi';
 import { ref } from 'vue';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { alarmContactGetPage } from '/@/api/device/deviceConfigApi';
+import { isWhereTypeValueDisabled } from './DeviceProfileStep3.vue';
 
 export const step1Schemas: FormSchema[] = [
   {
@@ -146,39 +147,85 @@ 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: '次要',
+    componentProps({ formModel, formActionType }) {
+      console.log(formModel.default);
+      return {
+        filterOptions: (i, v) => {
+          console.log(i, v);
         },
-        {
-          value: 'WARNING',
-          label: '警告',
+        placeholder: '请选择严重程度',
+        options: [
+          {
+            value: 'CRITICAL',
+            label: '危险',
+            disabled: formModel.default == 'CRITICAL',
+          },
+          {
+            value: 'MAJOR',
+            label: '重要',
+            disabled: formModel.default == 'MAJOR',
+          },
+          {
+            value: 'MINOR',
+            label: '次要',
+            // disabled: formModel.default == 'MINOR',
+          },
+          {
+            value: 'WARNING',
+            label: '警告',
+            // disabled: formModel.default == 'WARNING',
+          },
+          {
+            value: 'INDETERMINATE',
+            label: '不确定',
+            // disabled: formModel.default == 'INDETERMINATE',
+          },
+        ],
+        onChange: (v) => {
+          // const newFiletr = [
+          //   {
+          //     value: 'CRITICAL',
+          //     label: '危险',
+          //     // disabled: formModel.default == 'CRITICAL',
+          //   },
+          //   {
+          //     value: 'MAJOR',
+          //     label: '重要',
+          //     // disabled: formModel.default == 'MAJOR',
+          //   },
+          //   {
+          //     value: 'MINOR',
+          //     label: '次要',
+          //     // disabled: formModel.default == 'MINOR',
+          //   },
+          //   {
+          //     value: 'WARNING',
+          //     label: '警告',
+          //     // disabled: formModel.default == 'WARNING',
+          //   },
+          //   {
+          //     value: 'INDETERMINATE',
+          //     label: '不确定',
+          //     // disabled: formModel.default == 'INDETERMINATE',
+          //   },
+          // ];
+          // const { updateSchema } = formActionType;
+          // const newFileterFunc = newFiletr.filter((f) => f.value != v);
+          // updateSchema({
+          //   field: 'default',
+          //   componentProps: {
+          //     options: newFileterFunc,
+          //   },
+          // });
+          isWhereType.value = v ? v : 'INDETERMINATE';
         },
-        {
-          value: 'INDETERMINATE',
-          label: '不确定',
-        },
-      ],
-      onChange: (v) => {
-        isWhereType.value = v ? v : 'INDETERMINATE';
-      },
+      };
     },
   },
 ];