Merge branch 'ft-dev' of http://git.yuntengiot.com/huang/yun-teng-iot-front into ft-dev

+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;
+}

+import { FormSchema } from '/@/components/Table';
+
+export const formSchema: FormSchema[] = [
+  {
+    field: 'creator',
+    label: '用户昵称',
+    colProps: { span: 13 },
+    required: true,
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入用户昵称',
+    },
+  },
+  {
+    field: 'phoneNumber',
+    label: '手机号码',
+    colProps: { span: 13 },
+    required: true,
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入手机号码',
+    },
+  },
+  {
+    field: 'email',
+    label: '邮箱',
+    colProps: { span: 13 },
+    required: true,
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入邮箱',
+    },
+  },
+  {
+    field: 'enabled',
+    component: 'RadioGroup',
+    label: '性别',
+    colProps: {
+      span: 13,
+    },
+    componentProps: {
+      options: [
+        {
+          label: '男',
+          value: 'true',
+        },
+        {
+          label: '女',
+          value: 'false',
+        },
+      ],
+    },
+  },
+];

+<template>
+  <BasicModal
+    :useWrapper="true"
+    width="80vw"
+    :height="compHeight"
+    v-bind="$attrs"
+    @register="registerModal"
+    @ok="handleSubmit"
+  >
+    <div
+      style="
+        height: 62vh;
+        width: 120vw;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+      "
+    >
+      <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' }"
+            @change="updateAvatar"
+            width="150"
+          />
+        </div>
+        <Description
+          class="mt-8"
+          :column="1"
+          :schema="schema"
+          :bordered="true"
+          :data="getPersonalDetailValue"
+          @register="registerDesc"
+        />
+      </div>
+      <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, 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: 'creator',
+      label: '用户名称：',
+    },
+    {
+      field: 'phoneNumber',
+      label: '手机号码：',
+    },
+    {
+      field: 'email',
+      label: '用户邮箱：',
+    },
+    {
+      field: 'realName',
+      label: '用户昵称：',
+    },
+    {
+      field: 'createTime',
+      label: '过期时间：',
+    },
+    {
+      field: 'createTime',
+      label: '创建时间：',
+    },
+  ];
+  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,
+      });
+
+      const [registerModal] = useModalInner();
+      const [registerForm, { validate }] = useForm({
+        showActionButtonGroup: false,
+        schemas: formSchema,
+      });
+      const avatar = computed(() => {
+        return defaultImage;
+      });
+      const handleSubmit = async () => {
+        getPersonalValue.value = await validate();
+        await personalPut(getPersonalValue.value);
+        createMessage.success('修改成功');
+      };
+      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,
+        getPersonalDetailValue,
+        registerDesc,
+        schema,
+        registerModal,
+        registerForm,
+      };
+    },
+  });
+</script>
+<style lang="less"></style>

@@ -29,10 +29,16 @@
           :text="t('layout.header.dropdownItemLoginOut')"
           icon="ion:power-outline"
         />
+        <MenuItem
+          key="personal"
+          :text="t('layout.header.dropdownItemPersonal')"
+          icon="ion:build-outlined"
+        />
       </Menu>
     </template>
   </Dropdown>
   <LockAction @register="register" />
+  <PersonalChild @register="registerPersonal" />
 </template>
 <script lang="ts">
   // components
@@ -54,7 +60,7 @@
 
   import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
 
-  type MenuEvent = 'logout' | 'doc' | 'lock';
+  type MenuEvent = 'logout' | 'doc' | 'lock' | 'personal';
 
   export default defineComponent({
     name: 'UserDropdown',
@@ -64,6 +70,7 @@
       MenuItem: createAsyncComponent(() => import('./DropMenuItem.vue')),
       MenuDivider: Menu.Divider,
       LockAction: createAsyncComponent(() => import('../lock/LockModal.vue')),
+      PersonalChild: createAsyncComponent(() => import('../personal/index.vue')),
     },
     props: {
       theme: propTypes.oneOf(['dark', 'light']),
@@ -80,6 +87,7 @@
       });
 
       const [register, { openModal }] = useModal();
+      const [registerPersonal, { openModal: openModalPersonal }] = useModal();
 
       function handleLock() {
         openModal(true);
@@ -106,10 +114,21 @@
           case 'lock':
             handleLock();
             break;
+          case 'personal':
+            openPersonalFunc();
+            break;
         }
       }
 
+      const openPersonalFunc = () => {
+        setTimeout(() => {
+          openModalPersonal(true);
+        }, 10);
+      };
+
       return {
+        registerPersonal,
+        openPersonalFunc,
         prefixCls,
         t,
         getUserInfo,

@@ -4,6 +4,7 @@ export default {
     // user dropdown
     dropdownItemDoc: '文档',
     dropdownItemLoginOut: '退出系统',
+    dropdownItemPersonal: '个人中心',
 
     // tooltip
     tooltipErrorLog: '错误日志',

@@ -158,25 +158,11 @@
       function handleRedo() {
         current.value = 0;
       }
-      //用于生成uuid
-      function generateUUID() {
-        let d = new Date().getTime();
-        if (window.performance && typeof window.performance.now === 'function') {
-          d += performance.now(); //use high-precision timer if available
-        }
-        let uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-          let r = (d + Math.random() * 16) % 16 | 0;
-          d = Math.floor(d / 16);
-          return (c == 'x' ? r : (r & 0x3) | 0x8).toString(16);
-        });
-        return uuid;
-      }
       const handleSubmit = async () => {
         if (!unref(isUpdate)) {
           isGetStepThreeData.value.profileData = getStepThreeData.value;
           alarmProfileData.value.alarmProfile =
             await proxy.$refs.DeviceProfileStep4Ref.getAllFields();
-          alarmProfileData.value.alarmProfile.id = generateUUID();
           Object.assign(
             postDeviceConfogData.value,
             getStepOneData.value,

@@ -10,62 +10,48 @@
               alt="移除"
               src="../../../../assets/images/close.png"
             />
-            <!-- <DeleteOutlined style="font-size: 20px" class="mr-2" /> -->
           </div>
         </template>
         <div class="alert-type" style="margin-left: -26px; margin-top: -10px">
           <BasicForm @register="registerForm"
         /></div>
-        <CollapseContainer style="margin-top: -20px">
-          <template #action> </template>
-          <div style="margin-left: 10px; margin-top: -10px">
-            <BasicForm @register="registerFormHighSetting">
+        <div style="margin-top: -20px">
+          <div style="margin-left: 20px; margin-top: -10px">
+            <BasicForm
+              @register="registerFormHighSetting"
+              style="margin-left: 12px; margin-top: -10px"
+            >
               <template #checkBox="{ model, field }">
                 <Checkbox v-model:checked="model[field]">传递报警</Checkbox>
               </template>
             </BasicForm>
           </div>
-        </CollapseContainer>
+        </div>
         <p>创建报警规则</p>
         <template v-for="(childItem, createIndex) in item.alarms" :key="childItem.id">
-          <div class="aic mb-1" style="border: 1px solid #bfbfbf">
+          <div class="aic" style="border: 1px solid #bfbfbf">
             <div class="w-3/4">
               <div style="margin-left: -30px; margin-top: 20px"
                 ><BasicForm @register="registerFormCreateAlarm" />
               </div>
-              <div style="margin-left: 5px">
-                <div style="color: #f5594e" class="mt-4 ml-4"
+              <div style="margin-left: 5px; margin-top: -50px">
+                <div style="color: #f5594e" class="ml-4"
                   >报警规则条件：
                   <Button size="small" type="primary" @click="handleOpenAlaramRuleConditions"
                     >添加</Button
                   >
                   <p>{{ ruleTemplateData }}</p>
-                  <!-- <PlusOutlined
-                    @click="handleOpenAlaramRuleConditions"
-                    class="cursor-pointer ml-4"
-                    style="font-size: 20px"
-                  />{{ ruleTemplateData }} -->
                 </div>
                 <div style="white-space: wrap" class="mt-4 ml-4"
                   >启用规则：
                   <Button size="small" type="primary" @click="handleOpenEnableRule">添加</Button>
                   <p>{{ enableTemplateData }}</p>
-                  <!-- <EditOutlined
-                    @click="handleOpenEnableRule"
-                    class="cursor-pointer ml-4"
-                    style="font-size: 20px"
-                  /> -->
                   <div class="mt-4 ml-4" style="margin-left: 0px"
                     >详情模板：
                     <Button size="small" type="primary" @click="handleOpenDetailTemplate"
                       >添加</Button
                     >
                     <p>{{ detailTemplateData }}</p>
-                    <!-- <EditOutlined
-                    @click="handleOpenDetailTemplate"
-                    class="cursor-pointer ml-4"
-                    style="font-size: 20px"
-                  /> -->
                   </div>
                   <div style="margin-left: 0px; position: relative">
                     <BasicForm @register="dashboardForm" />
@@ -74,7 +60,7 @@
               </div>
               <div
                 class="remove-type"
-                style="display: inline-block; position: relative; top: -304px; left: 800px"
+                style="display: inline-block; position: relative; top: -237px; left: 800px"
               >
                 <img
                   style="cursor: pointer"
@@ -82,13 +68,6 @@
                   alt="移除"
                   src="../../../../assets/images/close.png"
                 />
-                <!-- <Tooltip title="移除">
-                <MinusCircleOutlined
-                  style="font-size: 25px; color: #305680"
-                  class="cursor-pointer"
-                  @click="deleteCondition(index, createIndex)"
-                />
-              </Tooltip> -->
               </div>
             </div>
           </div>
@@ -98,7 +77,10 @@
         >
         <div style="height: 20px"></div>
         <p>清除报警规则</p>
-        <template v-for="(childItem, createIndex) in item.clearAlarms" :key="childItem.id">
+        <template
+          v-for="(childClearItem, createIndex) in item.alarms[0].clearRule"
+          :key="childClearItem.id"
+        >
           <div class="aic mb-1" style="border: 1px solid #bfbfbf">
             <div class="w-3/4">
               <div style="margin-left: 5px">
@@ -108,11 +90,6 @@
                     >添加</Button
                   >
                   <p>{{ ruleClearTemplateData }}</p>
-                  <!-- <PlusOutlined
-                    @click="handleOpenClearAlaramRuleConditions"
-                    class="cursor-pointer ml-4"
-                    style="font-size: 20px"
-                  /> -->
                 </div>
                 <div style="white-space: wrap" class="mt-4 ml-4"
                   >启用规则：
@@ -120,49 +97,21 @@
                     >添加</Button
                   >
                   <p>{{ enableClearTemplateData }}</p>
-                  <!-- <EditOutlined
-                    @click="handleOpenClearEnableRule"
-                    class="cursor-pointer ml-4"
-                    style="font-size: 20px"
-                  /> -->
                   <div class="mt-4 ml-4" style="margin-left: 0px"
                     >详情模板：
                     <Button size="small" type="primary" @click="handleOpenClearDetailTemplate"
                       >添加</Button
                     >
                     <p>{{ detailClearTemplateData }}</p>
-                    <!-- <EditOutlined
-                    @click="handleOpenClearDetailTemplate"
-                    class="cursor-pointer ml-4"
-                    style="font-size: 20px"
-                  /> -->
                   </div>
                   <div style="margin-left: 0px">
                     <BasicForm @register="dashboardForm" />
                   </div>
                 </div>
               </div>
-              <!-- <div class="w-1/4 flex justify-center">
-                <img
-                  style="cursor: pointer"
-                  @click="deleteClearCondition(index, createIndex)"
-                  alt="移除"
-                  src="../../../../assets/images/close.png"
-                />
-                <Tooltip title="移除">
-                <MinusCircleOutlined
-                  style="font-size: 25px; color: #305680"
-                  class="cursor-pointer"
-                  @click="deleteClearCondition(index, createIndex)"
-                />
-              </Tooltip>
-              </div> -->
             </div>
           </div>
         </template>
-        <!-- <a-button style="border-radius: 10px" class="mt-5" @click="addClearRole(index)"
-          ><PlusCircleOutlined />添加清除条件</a-button
-        > -->
       </CollapseContainer>
     </template>
   </div>
@@ -217,7 +166,7 @@
 
 <script lang="ts">
   import { defineComponent, ref, unref, getCurrentInstance, watch } from 'vue';
-  import type { alarmListItem } from '../types/index';
+  import type { IProfileData } from '../types/index';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form';
   import {
@@ -227,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';
@@ -241,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,
@@ -283,34 +223,7 @@
       const enableClearTemplateData: any = ref(null);
       const detailClearTemplateData: any = ref(null);
       //告警列表
-      let profileData = ref<alarmListItem[]>([
-        // {
-        //   configuration: {},
-        //   transportConfiguration: {},
-        //   provisionConfiguration: {
-        //     provisionDeviceSecret: '',
-        //   },
-        //   alarms: [
-        //     {
-        //       id: Date.now() + Math.random(),
-        //       alarmType: '',
-        //       createRules: {},
-        //       clearRule: {},
-        //       propagate: true,
-        //       propagateRelationTypes: [''],
-        //     },
-        //   ],
-        //   clearAlarms: [
-        //     {
-        //       id: Date.now() + Math.random(),
-        //       alarmType: '',
-        //       clearRules: {},
-        //       propagate: true,
-        //       propagateRelationTypes: [''],
-        //     },
-        //   ],
-        // },
-      ]);
+      let profileData = ref<IProfileData[]>([]);
       const log = (e) => {
         console.log(e);
       };
@@ -324,35 +237,44 @@
       };
 
       const addAlarmRule = () => {
-        // console.log(profileData.value.alarms.length)
         unref(profileData).push({
-          configuration: {},
-          transportConfiguration: {},
+          configuration: {
+            type: '',
+          },
+          transportConfiguration: {
+            type: '',
+          },
           provisionConfiguration: {
             provisionDeviceSecret: '',
           },
           alarms: [
             {
-              id: Date.now() + Math.random(),
+              id: Date.now() + Math.random() + '',
               alarmType: '',
               createRules: {},
-              clearRule: {},
-              propagate: true,
-              propagateRelationTypes: [''],
-            },
-          ],
-          clearAlarms: [
-            {
-              id: Date.now() + Math.random(),
-              alarmType: '',
-              clearRules: {},
-              propagate: true,
+              clearRule: [
+                {
+                  id: Date.now() + Math.random() + '',
+                  alarmDetails: '',
+                  dashboardId: {
+                    id: '',
+                    entityType: '',
+                  },
+                  propagate: '',
+                  propagateRelationTypes: [''],
+                  schedule: {
+                    type: 'string',
+                  },
+                  condition: {},
+                },
+              ],
+              propagate: false,
               propagateRelationTypes: [''],
             },
           ],
         });
       };
-      //Mobile dashboard:
+      //TODO Mobile dashboard:
       const [dashboardForm] = useForm({
         labelWidth: 120,
         schemas: dashboardFormScheme,
@@ -430,42 +352,47 @@
       // 添加‘创建条件’
       const addCreateRole = (index: number) => {
         unref(profileData)[index].alarms.push({
-          id: Date.now() + Math.random(),
-          alarmVisible: false,
-          addKeyFilterVisible: false,
-          detailVisible: false,
-          detail: '',
-          filterList: [],
+          id: Date.now() + Math.random() + '',
+          alarmType: '',
+          createRules: {},
+          clearRule: [
+            {
+              id: Date.now() + Math.random() + '',
+              alarmDetails: '',
+              dashboardId: {
+                id: '',
+                entityType: '',
+              },
+              propagate: '',
+              propagateRelationTypes: [''],
+              schedule: {
+                type: 'string',
+              },
+              condition: {},
+            },
+          ],
+          propagate: false,
+          propagateRelationTypes: [''],
         });
       };
       // 删除‘创建条件’
       const deleteCondition = (index: number, createIndex: number) => {
-        profileData.value[index].alarms.splice(createIndex, 1);
-      };
-      // 添加‘清除条件’
-      const addClearRole = (index: number) => {
-        unref(profileData)[index].clearAlarms.push({
-          id: Date.now() + Math.random(),
-          alarmVisible: false,
-          addKeyFilterVisible: false,
-          detailVisible: false,
-          detail: '',
-          filterList: [],
-        });
-      };
-      // 删除‘清除条件’
-      const deleteClearCondition = (index: number, createIndex: number) => {
-        profileData.value[index].clearAlarms.splice(createIndex, 1);
+        unref(profileData)[index].alarms.splice(createIndex, 1);
       };
       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) => {
@@ -509,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) => {
@@ -537,8 +466,8 @@
           }
         });
         ruleTemplateData.value = `
-         键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
-         `;
+           键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
+           `;
 
         ruleLastObj.value = v1;
         const predicate = {
@@ -583,8 +512,8 @@
       const getAllClearFieldsFunc = (v) => {
         detailClearObj.value = v;
         detailClearTemplateData.value = `
-         报警详细信息:${v.alarmDetails}
-         `;
+           报警详细信息:${v.alarmDetails}
+           `;
       };
       //启用规则
       const getAllClearFieldsEnabFunc = (v) => {
@@ -628,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) => {
@@ -655,8 +586,8 @@
           }
         });
         ruleClearTemplateData.value = `
-         键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
-         `;
+           键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
+           `;
 
         ruleLastObj.value = v1;
         const predicate = {
@@ -696,6 +627,19 @@
         };
         Object.assign(addClearitionalObj.value, getValueConditon);
       };
+      //用于生成uuid
+      function generateUUID() {
+        let d = new Date().getTime();
+        if (window.performance && typeof window.performance.now === 'function') {
+          d += performance.now(); //use high-precision timer if available
+        }
+        let uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+          let r = (d + Math.random() * 16) % 16 | 0;
+          d = Math.floor(d / 16);
+          return (c == 'x' ? r : (r & 0x3) | 0x8).toString(16);
+        });
+        return uuid;
+      }
       const handleFormStep3toStep4Next = async () => {
         try {
           const scheduleClearValue = {
@@ -744,6 +688,9 @@
           const valueRegisterFormAndId = {
             alarmType: Object.values(valueRegisterForm)[0],
           };
+          const objectId = {
+            id: generateUUID(),
+          };
           const valueRegisterFormHighSetting = await validateRegisterFormHighSetting();
           const valueRegisterFormCreateAlarm = await validateRegisterFormCreateAlarm();
           console.log(valueRegisterFormCreateAlarm);
@@ -756,7 +703,8 @@
             valueRegisterFormAndId,
             getValueRegisterFormHighSetting,
             getCreateRulesAllObj,
-            getClearRulesAllObj
+            getClearRulesAllObj,
+            objectId
           );
           alarmss.value.push(emptyObj.value);
           const getAlarms = {
@@ -827,8 +775,6 @@
         handleOpenClearDetailTemplate,
         handleOpenClearEnableRule,
         handleOpenClearAlaramRuleConditions,
-        addClearRole,
-        deleteClearCondition,
         detailTemplateData,
         enableTemplateData,
         ruleTemplateData,

@@ -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';
-      },
+      };
     },
   },
 ];

-interface alarmRuleFilter {
-  operator: string;
-  value: string;
+interface IConfiguration {
+  type?: string;
 }
-interface createRule {
-  id: number;
-  alarmVisible: boolean;
-  addKeyFilterVisible: boolean;
-  detailVisible: boolean;
-  detail: string;
-  filterList?: alarmRuleFilter[];
+interface ITansportConfiguration {
+  type?: string;
 }
-interface clearRule {
-  detail: string;
-}
-
 interface provisionConfigurationD {
-  provisionDeviceSecret: string;
+  provisionDeviceSecret?: string;
 }
-
-interface IAddAlarms {
-  id: number;
-  alarmType: string;
-  createRules: object;
-  clearRule: object;
-  propagate: true;
+type ICreateRule = {};
+type IClearRule = {
+  id: string;
+  alarmDetails: string;
+  dashboardId: {
+    id: string;
+    entityType: string;
+  };
+  propagate: string;
   propagateRelationTypes: string[];
-}
-interface IAddClearAlarms {
-  id: number;
+  schedule: {
+    type: string;
+  };
+  condition: object;
+};
+interface IAlarms {
+  id: string;
   alarmType: string;
-  clearRules: object;
-  propagate: true;
+  createRules: ICreateRule;
+  clearRule?: IClearRule[];
+  propagate: boolean;
   propagateRelationTypes: string[];
 }
 
-export interface alarmListItem {
-  configuration?: object;
-  transportConfiguration?: object;
+export interface IProfileData {
+  configuration?: IConfiguration;
+  transportConfiguration?: ITansportConfiguration;
   provisionConfiguration?: provisionConfigurationD;
-  // id?: number;
-  alarms?: IAddAlarms[];
-  clearAlarms?: IAddClearAlarms[];
-  // alarmType?: string;
-  // messageMode?: string;
-  // createRule?: createRule[];
-  // clearRule?: clearRule[];
-  // propagate?: boolean;
-  // propagateRelationTypes?: string[];
+  alarms?: IAlarms[];
 }