fix:所有字段验证失效问题

@@ -6,12 +6,18 @@ VITE_PUBLIC_PATH = /
 
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
-# VITE_PROXY = [["/api","http://192.168.10.118:8080/api"],["/upload","http://192.168.10.116:3300/upload"]]
-VITE_PROXY = [["/api","http://101.133.234.90:8080/api"],["/upload","http://192.168.10.116:3300/upload"]]
-# VITE_PROXY=[["/api","https://vvbin.cn/test"]]
+
+# 本地
+# VITE_PROXY = [["/api","http://localhost:8080/api"]]
+
+# 线上
+VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
+
+# 实时数据的ws地址
+VITE_WEB_SOCKET = ws://101.133.234.90:8080/api/ws/plugins/telemetry?token=  
 
 # Delete console
-VITE_DROP_CONSOLE = false
+VITE_DROP_CONSOLE = true
 
 # Basic interface address SPA
 VITE_GLOB_API_URL=/api

@@ -10,26 +10,29 @@ VITE_DROP_CONSOLE = true
 # Whether to enable gzip or brotli compression
 # Optional: gzip | brotli | none
 # If you need multiple forms, you can use `,` to separate
-VITE_BUILD_COMPRESS = 'none'
+VITE_BUILD_COMPRESS = 'gzip'
 
 # Whether to delete origin files when using compress, default false
 VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 
 # Basic interface address SPA
-VITE_GLOB_API_URL=/api
+VITE_GLOB_API_URL=http://localhost:8080/api
 
 # File upload address， optional
 # It can be forwarded by nginx or write the actual address directly
-VITE_GLOB_UPLOAD_URL=/upload
+VITE_GLOB_UPLOAD_URL=http://localhost:8080/upload
 
 # Interface prefix
-VITE_GLOB_API_URL_PREFIX=/v1
+VITE_GLOB_API_URL_PREFIX=/yt
 
 # Whether to enable image compression
-VITE_USE_IMAGEMIN= true
+VITE_USE_IMAGEMIN= false
 
 # use pwa
 VITE_USE_PWA = false
 
 # Is it compatible with older browsers
-VITE_LEGACY = false
+VITE_LEGACY = true
+
+# 实时数据的ws地址
+VITE_WEB_SOCKET = ws://101.133.234.90:8080/api/ws/plugins/telemetry?token=

-import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
-/**
- * @description: Request list interface parameters
- */
-export type MessageConfigParams = BasicPageParams & MessageParams;
-
-export type MessageParams = {
-  status?: number;
-  messageType?: string;
-};
-
-export interface MessageConfig {
-  id: string;
-  configName: string;
-  messageType: string;
-  platformType: string;
-  config: ConfigParams;
-  createTime: string;
-  updateTime: string;
-  status: number;
-}
-export interface ConfigParams {
-  host: string;
-  port: number;
-  username: string;
-  password: string;
-  accessKeyId: string;
-  accessKeySecret: string;
-}
-
-/**
- * @description: Request list return value
- */
-export type MessageConfigResultModel = BasicFetchResult<MessageConfig>;
-
-export type MessageConfigResult = MessageConfig;

@@ -30,3 +30,14 @@ export const getDeviceDataKeys = (id: string) => {
     }
   );
 };
+// 获取设备状态，在线 or 离线时间
+export const getDeviceActiveTime = (entityId: string) => {
+  return defHttp.get(
+    {
+      url: `/plugins/telemetry/DEVICE/${entityId}/values/attributes?keys=active`,
+    },
+    {
+      joinPrefix: false,
+    }
+  );
+};

+import { BasicPageParams } from './../model/baseModel';
+import { defHttp } from '/@/utils/http/axios';
+enum HomeEnum {
+  home = '/homepage/left/top',
+  TenantExpireTimeList = '/homepage/right',
+  EntitiesQueryFind = '/entitiesQuery/find',
+}
+
+export const getHomeData = () => {
+  return defHttp.get({
+    url: HomeEnum.home,
+  });
+};
+
+// 获取即将过期租户列表
+export const getTenantExpireTimeList = (params: BasicPageParams) => {
+  return defHttp.get({
+    url: HomeEnum.TenantExpireTimeList,
+    params,
+  });
+};
+
+// 获取entities实体ID
+export const getEntitiesId = () => {
+  return defHttp.post(
+    {
+      url: HomeEnum.EntitiesQueryFind,
+      data: {
+        entityFilter: {
+          type: 'apiUsageState',
+          resolveMultiple: false,
+        },
+        pageLink: {
+          pageSize: 1,
+          page: 0,
+          sortOrder: {
+            key: {
+              type: 'ENTITY_FIELD',
+              key: 'createdTime',
+            },
+            direction: 'DESC',
+          },
+        },
+        entityFields: [
+          {
+            type: 'ENTITY_FIELD',
+            key: 'name',
+          },
+          {
+            type: 'ENTITY_FIELD',
+            key: 'label',
+          },
+          {
+            type: 'ENTITY_FIELD',
+            key: 'additionalInfo',
+          },
+        ],
+      },
+    },
+    {
+      joinPrefix: false,
+    }
+  );
+};

-import { defHttp } from '/@/utils/http/axios';
-
-enum Api {
-  // The address does not exist
-  Error = '/error',
-}
-
-/**
- * @description: Trigger ajax error
- */
-
-export const fireErrorApi = () => defHttp.get({ url: Api.Error });

-import { defHttp } from '/@/utils/http/axios';
-
-enum Api {
-  TREE_OPTIONS_LIST = '/tree/getDemoOptions',
-}
-
-/**
- * @description: Get sample options value
- */
-export const treeOptionsListApi = (params?: Recordable) =>
-  defHttp.get<Recordable[]>({ url: Api.TREE_OPTIONS_LIST, params });

-import { UploadApiResult } from './model/uploadModel';
+import { FileUploadResponse } 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',
+  BaseUploadUrl = '/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 uploadApi = (file) => {
+  return defHttp.post<FileUploadResponse>({ url: API.BaseUploadUrl, params: file });
 };
 
 export const personalGet = (id: string) => {

-export interface UploadApiResult {
-  message: string;
-  code: number;
-  url: string;
+export interface FileUploadResponse {
+  fileName: string;
+  fileDownloadUri: string;
+  fileType: string;
+  size: number;
+  fileStaticUri: string;
 }

@@ -17,7 +17,7 @@ enum Api {
 export const getMenuList = () => {
   const userStore = useUserStore();
   let url = Api.GetMenuList;
-  if (userStore.getRoleList.find((v) => v == RoleEnum.ROLE_SYS_ADMIN)) {
+  if (userStore.getRoleList.find((v) => v == RoleEnum.SYS_ADMIN)) {
     url = Api.SysAdminMenuList;
   }
   return defHttp.get<getMenuListResultModel>({ url });

@@ -4,13 +4,14 @@
 -->
 
 <template>
-  <div class="anticon" :class="getAppLogoClass" @click="goHome">
-    <img :src="getLogo" />
+  <div class="application" :class="getAppLogoClass">
+    <img v-if="getLogo" :src="getLogo" />
+    <img v-else src="/src/assets/images/logo.png" />
     <span
       class="ml-2 md:opacity-100"
       :class="getTitleClass"
       v-show="showTitle"
-      style="white-space: nowrap"
+      style="white-space: nowrap; font-size: small"
     >
       {{ getTitle }}
     </span>
@@ -19,10 +20,8 @@
 <script lang="ts" setup>
   import { computed, unref } from 'vue';
   import { useGlobSetting } from '/@/hooks/setting';
-  import { useGo } from '/@/hooks/web/usePage';
   import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
   import { useDesign } from '/@/hooks/web/useDesign';
-  import { PageEnum } from '/@/enums/pageEnum';
   import { useUserStore } from '/@/store/modules/user';
   const props = defineProps({
     /**
@@ -43,7 +42,6 @@
   const { getCollapsedShowTitle } = useMenuSetting();
   const userStore = useUserStore();
   const { title } = useGlobSetting();
-  const go = useGo();
 
   const getAppLogoClass = computed(() => [
     prefixCls,
@@ -56,12 +54,8 @@
       'xs:opacity-0': !props.alwaysShowTitle,
     },
   ]);
-
-  function goHome() {
-    go(userStore.getUserInfo.homePath || PageEnum.BASE_HOME);
-  }
   const getLogo = computed(() => {
-    return userStore.platInfo?.logo ?? '/src/assets/images/logo.png';
+    return userStore.platInfo?.logo;
   });
   const getTitle = computed(() => {
     // 设置icon
@@ -82,7 +76,6 @@
     padding-left: 7px;
     cursor: pointer;
     transition: all 0.2s ease;
-
     &.light {
       border-bottom: 1px solid @border-color-base;
     }

 export enum RoleEnum {
-  ROLE_SYS_ADMIN = 'SYS_ADMIN',
-  ROLE_TENANT_ADMIN = 'TENANT_ADMIN',
-  ROLE_NORMAL_USER = 'CUSTOMER_USER',
-  ROLE_PLATFORM_ADMIN = 'PLATFORM_ADMIN',
+  SYS_ADMIN = 'SYS_ADMIN',
+  PLATFORM_ADMIN = 'PLATFORM_ADMIN',
+  TENANT_ADMIN = 'TENANT_ADMIN',
+  CUSTOMER_USER = 'CUSTOMER_USER',
+}
+
+export function isAdmin(role: string) {
+  if (role === RoleEnum.SYS_ADMIN || role === RoleEnum.PLATFORM_ADMIN) {
+    return true;
+  } else if (role === RoleEnum.TENANT_ADMIN || role === RoleEnum.CUSTOMER_USER) {
+    return false;
+  }
 }

+import { ref, computed } from 'vue';
+import { useMessage } from '/@/hooks/web/useMessage';
+/**
+ *
+ * @param deleteFn 要删除的API接口方法
+ * @param handleSuccess  刷新表格的方法
+ * @returns {
+ * hasBatchDelete: 是否可以删除
+ * selectionOptions 表格复选框配置项
+ * handleDeleteOrBatchDelete 删除方法，适用单一删除和批量删除。参数为null为批量删除
+ * }
+ *
+ */
+export interface selectionOptions {
+  rowKey: string;
+  clickToRowSelect: boolean;
+  rowSelection: {
+    onChange: (selectedRowKeys: string[]) => void;
+    type: 'radio' | 'checkbox';
+  };
+}
+export const useBatchDelete = (
+  deleteFn: (deleteIds: string[]) => Promise<void>,
+  handleSuccess: () => void
+) => {
+  const { createMessage } = useMessage();
+  const selectedRowIds = ref<string[]>([]);
+  const hasBatchDelete = computed(() => selectedRowIds.value.length <= 0);
+  // 复选框事件
+  const onSelectRowChange = (selectedRowKeys: string[]) => {
+    selectedRowIds.value = selectedRowKeys;
+  };
+  const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
+    if (record) {
+      try {
+        await deleteFn([record.id]);
+        createMessage.success('删除联系人成功');
+        handleSuccess();
+      } catch (e) {
+        createMessage.error('删除失败');
+      }
+    } else {
+      try {
+        await deleteFn(selectedRowIds.value);
+        createMessage.success('批量删除联系人成功');
+        selectedRowIds.value = [];
+        handleSuccess();
+      } catch (e) {
+        createMessage.info('删除失败');
+      }
+    }
+  };
+  const selectionOptions: selectionOptions = {
+    rowKey: 'id',
+    clickToRowSelect: false,
+    rowSelection: {
+      onChange: onSelectRowChange,
+      type: 'checkbox',
+    },
+  };
+  return { hasBatchDelete, selectionOptions, handleDeleteOrBatchDelete };
+};

@@ -78,6 +78,7 @@
 
     .ant-badge {
       font-size: 18px;
+      display: none;
 
       .ant-badge-multiple-words {
         padding: 0 4px;

 import { FormSchema } from '/@/components/Table';
+import { phoneRule, emailRule } from '/@/utils/rules';
 
 export const formSchema: FormSchema[] = [
   {
-    field: 'nickName',
+    field: 'realName',
     label: '用户昵称',
     colProps: { span: 13 },
     required: true,
@@ -20,6 +21,7 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       placeholder: '请输入手机号码',
     },
+    rules: phoneRule,
   },
   {
     field: 'email',
@@ -30,5 +32,6 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       placeholder: '请输入邮箱',
     },
+    rules: emailRule,
   },
 ];

 <template>
   <BasicModal
     :useWrapper="true"
-    width="80vw"
+    width="82vw"
     :height="compHeight"
     v-bind="$attrs"
     @register="registerModal"
@@ -22,15 +22,34 @@
           ><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 class="mb-2" style="font-weight: 700">个人头像</div>
+          <Upload
+            style="width: 20vw"
+            name="avatar"
+            list-type="picture-card"
+            class="avatar-uploader"
+            :show-upload-list="false"
+            :customRequest="customUploadqrcodePic"
+            :before-upload="beforeUploadqrcodePic"
+          >
+            <img
+              style="text-align: center; border-radius: 50%; width: 10vw; height: 15vh"
+              v-if="peresonalPic"
+              :src="peresonalPic"
+              alt="avatar"
+            />
+            <div v-else>
+              <div style="margin-top: 30px">
+                <PlusOutlined style="font-size: 30px" />
+              </div>
+              <div
+                class="ant-upload-text flex"
+                style="width: 280px; height: 130px; align-items: center"
+              >
+                支持.PNG、.JPG、.SVG格式，建议尺寸为300px × 300px（及以上），大小不超过2M。</div
+              >
+            </div>
+          </Upload>
         </div>
         <Description
           class="mt-8"
@@ -66,13 +85,13 @@
   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';
+  import { Upload } from 'ant-design-vue';
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { FileItem } from '/@/components/Upload/src/typing';
 
   const schema: DescItem[] = [
     {
@@ -102,68 +121,91 @@
   ];
   export default defineComponent({
     name: 'index',
-    components: { BasicModal, BasicForm, Description, CropperAvatar },
-    setup() {
-      const userStore = useUserStore();
+    components: { BasicModal, BasicForm, Description, Upload, PlusOutlined },
+    emits: ['refreshPersonl', 'register'],
+    setup(_, { emit }) {
       const userInfo = getAuthCache(USER_INFO_KEY);
       const { createMessage } = useMessage();
       const getPersonalValue: any = ref({});
       const getPersonalDetailValue: any = ref({});
-      const avatarUrl: any = ref('');
+      const updatePersonalData: any = ref({});
       const getBackendV: any = ref({});
       const [registerDesc] = useDescription({
         title: '个人详情',
         schema: schema,
       });
 
-      const [registerModal, { closeModal }] = useModalInner();
-      const [registerForm, { validate, resetFields }] = useForm({
+      const peresonalPic = ref();
+
+      const customUploadqrcodePic = async ({ file }) => {
+        if (beforeUploadqrcodePic(file)) {
+          const formData = new FormData();
+          formData.append('file', file);
+          const response = await uploadApi(formData);
+          if (response.fileStaticUri) {
+            peresonalPic.value = response.fileStaticUri;
+          }
+        }
+      };
+
+      const beforeUploadqrcodePic = (file: FileItem) => {
+        const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+        if (!isJpgOrPng) {
+          createMessage.error('只能上传图片文件!');
+        }
+        const isLt2M = (file.size as number) / 1024 / 1024 < 2;
+        if (!isLt2M) {
+          createMessage.error('图片大小不能超过2MB!');
+        }
+        return isJpgOrPng && isLt2M;
+      };
+
+      const [registerForm, { validate, resetFields, setFieldsValue }] = useForm({
         showActionButtonGroup: false,
         schemas: formSchema,
       });
-      const avatar = computed(() => {
-        const { avatar } = userStore.getUserInfo;
-        return avatar || defaultImage;
+
+      const [registerModal, { closeModal }] = useModalInner(async (data) => {
+        (peresonalPic.value = data.userInfo.avatar),
+          setFieldsValue({
+            realName: data.userInfo.realName,
+            phoneNumber: data.userInfo.phoneNumber,
+            email: data.userInfo.email,
+          });
+        if (data.userInfo) {
+          getPersonalDetailValue.value = data.userInfo;
+        }
+        if (Object.keys(updatePersonalData.value).length != 0) {
+          getPersonalDetailValue.value = updatePersonalData.value;
+          peresonalPic.value = updatePersonalData.value.avatar;
+          setFieldsValue({
+            realName: updatePersonalData.value.realName,
+            phoneNumber: updatePersonalData.value.phoneNumber,
+            email: updatePersonalData.value.email,
+          });
+        }
       });
       const handleSubmit = async () => {
-        // console.log(userStore.getUserInfo);
         const getUserInfo = await userInfo;
-        // console.log(getUserInfo);
         getPersonalValue.value = await validate();
         getPersonalValue.value.id = getUserInfo.userId;
         getPersonalValue.value.username = getBackendV.value.username;
-        getPersonalValue.value.avatar = avatarUrl.value;
-        await personalPut(getPersonalValue.value);
+        getPersonalValue.value.avatar = peresonalPic.value;
+        const data = await personalPut(getPersonalValue.value);
+        updatePersonalData.value = data;
         createMessage.success('修改成功');
         closeModal();
         resetFields();
+        emit('refreshPersonl', updatePersonalData.value);
       };
-      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;
-        }
-      };
-      getPersonalDetail();
-
-      // onMounted(async () => {
-      //   getPersonalDetail();
-      // });
       const compHeight = computed(() => {
         return 1000;
       });
       return {
-        uploadApi,
+        peresonalPic,
+        beforeUploadqrcodePic,
+        customUploadqrcodePic,
         compHeight,
-        updateAvatar,
-        avatar,
         handleSubmit,
         getPersonalDetailValue,
         registerDesc,
@@ -174,4 +216,22 @@
     },
   });
 </script>
-<style lang="less"></style>
+<style scoped lang="less">
+  .change-avatar {
+    /deep/ .ant-upload-select-picture-card {
+      display: inherit;
+      float: none;
+      width: 10vw;
+      height: 17vh;
+      margin-right: 8px;
+      margin-bottom: 8px;
+      text-align: center;
+      vertical-align: top;
+      background-color: #fafafa;
+      border: 1px dashed #d9d9d9;
+      border-radius: 50%;
+      cursor: pointer;
+      transition: border-color 0.3s ease;
+    }
+  }
+</style>

 <template>
   <Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`">
     <span :class="[prefixCls, `${prefixCls}--${theme}`]" class="flex">
-      <img :class="`${prefixCls}__header`" :src="getUserInfo.avatar" />
+      <img
+        :class="`${prefixCls}__header`"
+        :src="refreshPersonlData.avatar ? refreshPersonlData.avatar : getUserInfo.avatar"
+      />
       <span :class="`${prefixCls}__info hidden md:block`">
         <span :class="`${prefixCls}__name  `" class="truncate">
-          {{ getUserInfo.realName }}
+          {{ refreshPersonlData.realName ? refreshPersonlData.realName : getUserInfo.realName }}
         </span>
       </span>
     </span>
@@ -12,12 +15,10 @@
     <template #overlay>
       <Menu @click="handleMenuClick">
         <MenuItem
-          key="doc"
-          :text="t('layout.header.dropdownItemDoc')"
+          key="personal"
+          :text="t('layout.header.dropdownItemPersonal')"
           icon="ion:document-text-outline"
-          v-if="getShowDoc"
         />
-        <MenuDivider v-if="getShowDoc" />
         <MenuItem
           v-if="getUseLockPage"
           key="lock"
@@ -29,22 +30,21 @@
           :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" />
+  <PersonalChild
+    @refreshPersonl="refreshPersonlFunc"
+    ref="personalRef"
+    @register="registerPersonal"
+  />
 </template>
 <script lang="ts">
   // components
   import { Dropdown, Menu } from 'ant-design-vue';
 
-  import { defineComponent, computed } from 'vue';
+  import { defineComponent, computed, getCurrentInstance, ref, reactive } from 'vue';
 
   import { DOC_URL } from '/@/settings/siteSetting';
 
@@ -53,13 +53,12 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useModal } from '/@/components/Modal';
-
   import headerImg from '/@/assets/images/header.jpg';
   import { propTypes } from '/@/utils/propTypes';
   import { openWindow } from '/@/utils';
-
   import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
-
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
   type MenuEvent = 'logout' | 'doc' | 'lock' | 'personal';
 
   export default defineComponent({
@@ -68,7 +67,6 @@
       Dropdown,
       Menu,
       MenuItem: createAsyncComponent(() => import('./DropMenuItem.vue')),
-      MenuDivider: Menu.Divider,
       LockAction: createAsyncComponent(() => import('../lock/LockModal.vue')),
       PersonalChild: createAsyncComponent(() => import('../personal/index.vue')),
     },
@@ -76,14 +74,21 @@
       theme: propTypes.oneOf(['dark', 'light']),
     },
     setup() {
+      const refreshPersonlData = reactive({
+        avatar: '',
+        realName: '',
+      });
+      const userInfo = getAuthCache(USER_INFO_KEY);
+      const { proxy } = getCurrentInstance();
+      const personalRef = ref(null);
       const { prefixCls } = useDesign('header-user-dropdown');
       const { t } = useI18n();
       const { getShowDoc, getUseLockPage } = useHeaderSetting();
       const userStore = useUserStore();
 
       const getUserInfo = computed(() => {
-        const { realName = '', avatar, desc } = userStore.getUserInfo || {};
-        return { realName, avatar: avatar || headerImg, desc };
+        const { realName = '', avatar } = userStore.getUserInfo || {};
+        return { realName, avatar: avatar || headerImg };
       });
 
       const [register, { openModal }] = useModal();
@@ -122,11 +127,21 @@
 
       const openPersonalFunc = () => {
         setTimeout(() => {
-          openModalPersonal(true);
+          openModalPersonal(true, {
+            userInfo,
+          });
         }, 10);
       };
 
+      const refreshPersonlFunc = (v) => {
+        refreshPersonlData.avatar = v.avatar;
+        refreshPersonlData.realName = v.realName;
+      };
+
       return {
+        refreshPersonlData,
+        refreshPersonlFunc,
+        personalRef,
         registerPersonal,
         openPersonalFunc,
         prefixCls,

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

@@ -12,7 +12,7 @@ export default {
     networkExceptionMsg:
       'Please check if your network connection is normal! The network is abnormal',
 
-    errMsg401: 'no permission',
+    errMsg401: '',
     errMsg403: 'not authorized',
     errMsg404: 'the resource was not found!',
     errMsg405: 'Network request error, request method not allowed!',

@@ -10,8 +10,7 @@ export default {
     apiRequestFailed: '请求出错，请稍候重试',
     networkException: '网络异常',
     networkExceptionMsg: '网络异常，请检查您的网络连接是否正常!',
-
-    errMsg401: '没有权限!',
+    errMsg401: '',
     errMsg403: '未授权',
     errMsg404: '未找到该资源!',
     errMsg405: '网络请求错误,请求方法未允许!',

@@ -14,13 +14,7 @@ import { setupStore } from '/@/store';
 import { setupGlobDirectives } from '/@/directives';
 import { setupI18n } from '/@/locales/setupI18n';
 import { registerGlobComp } from '/@/components/registerGlobComp';
-// Do not introduce on-demand in local development?
-// In the local development for introduce on-demand, the number of browser requests will increase by about 20%.
-// Which may slow down the browser refresh.
-// Therefore, all are introduced in local development, and only introduced on demand in the production environment
-if (import.meta.env.DEV) {
-  import('ant-design-vue/dist/antd.less');
-}
+import 'ant-design-vue/dist/antd.less';
 
 async function bootstrap() {
   const app = createApp(App);

@@ -129,7 +129,6 @@ 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);

@@ -10,7 +10,6 @@ import { SessionTimeoutProcessingEnum } from '/@/enums/appEnum';
 const { createMessage, createErrorModal } = useMessage();
 const error = createMessage.error!;
 const stp = projectSetting.sessionTimeoutProcessing;
-
 export function checkStatus(
   status: number,
   msg: string,
@@ -19,7 +18,6 @@ export function checkStatus(
   const { t } = useI18n();
   const userStore = useUserStoreWithOut();
   let errMessage = '';
-
   switch (status) {
     case 400:
       errMessage = `${msg}`;

@@ -10,58 +10,17 @@ import { useGlobSetting } from '/@/hooks/setting';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { RequestEnum, ContentTypeEnum } from '/@/enums/httpEnum';
 import { isString } from '/@/utils/is';
-import { getJwtToken, getAuthCache } from '/@/utils/auth';
+import { getJwtToken } from '/@/utils/auth';
 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 { 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: 数据处理，方便区分多种处理方式
@@ -162,32 +121,13 @@ const transform: AxiosTransform = {
     const msg: string = response?.data?.msg ?? '';
     const err: string = error?.toString?.() ?? '';
     let errMessage = '';
-
     try {
-      if (response.data.code === '401' || response.data.msg === 'tenant has expired') {
-        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();
+      console.log(response.data);
+      if (response.data.status == '401' || response.data.message == '"Authentication failed"') {
+        window.localStorage.clear();
+        window.sessionStorage.clear();
+        router.push(PageEnum.BASE_HOME);
       }
-
       if (code === 'ECONNABORTED' && message.indexOf('timeout') !== -1) {
         errMessage = t('sys.api.apiTimeoutMessage');
       }

@@ -60,3 +60,171 @@ export const EmailRegexp = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a
 
 // 手机号正则
 export const PhoneRegexp = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+
+//站内通知
+export const NotificationTitleMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('标题长度不超过200字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const NotificationContentMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('内容长度不超过50字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceNameMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 30) {
+        return Promise.reject('设备名称长度不超过30字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceProfileIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('设备配置长度不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceOrgIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('组织长度不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceLabelMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 255) {
+        return Promise.reject('设备标签不超过255字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+export const DeviceDescriptionlMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 500) {
+        return Promise.reject('备注不超过500字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+export const DeviceIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('id不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceTenantIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('租户Code不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceTbDeviceIdMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 36) {
+        return Promise.reject('tbDeviceId不超过36字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceUserNameMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('用户名长度不超过50字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceQueryUserNameMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 50) {
+        return Promise.reject('设备名称长度不超过50字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
+export const DeviceProfileQueryUserNameMaxLength: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      if (String(value).length > 255) {
+        return Promise.reject('配置名称长度不超过255字');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];

@@ -33,6 +33,23 @@ export const alarmSearchSchemas: FormSchema[] = [
     label: '告警类型',
     component: 'Input',
     colProps: { span: 6 },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入告警类型',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 255) {
+              return Promise.reject('字数不超过255个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
   {
     field: 'endTime',

@@ -51,7 +51,6 @@
           severity: alarmLevel(data.severity),
           status: statusType(data.status),
         });
-        console.log(data.status);
         alarmStatus.value = data.status;
         alarmId.value = data.id;
       });

@@ -41,6 +41,7 @@ export const formSchema: FormSchema[] = [
     label: '',
     component: 'Input',
     componentProps: {
+      maxLength: 255,
       placeholder: '请输入设备名称',
     },
   },

@@ -34,8 +34,16 @@
       :canFullscreen="false"
     >
       <BasicForm @register="registerForm" />
-      <div ref="chartRef" :style="{ height: '600px', width }"></div>
+      <Alert
+        v-if="!isNull"
+        message="当前时间节点暂无历史数据"
+        description="请尝试选择其他时间段查询历史数据"
+        type="warning"
+        show-icon
+      />
+      <div v-show="isNull" ref="chartRef" :style="{ height: '600px', width }"></div>
     </BasicModal>
+    <DeviceDetailDrawer @register="registerDetailDrawer" />
   </div>
 </template>
 <script lang="ts">
@@ -44,22 +52,30 @@
   import { formSchema, columns } from './config.data';
   import { BasicTable, useTable } from '/@/components/Table';
   import { devicePage } from '/@/api/alarm/contact/alarmContact';
-  import { Tag } from 'ant-design-vue';
+  import { Tag, Alert } from 'ant-design-vue';
   import { DeviceState } from '/@/api/device/model/deviceModel';
   import { BAI_DU_MAP_URL } from '/@/utils/fnUtils';
   import { useModal, BasicModal } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form';
   import { schemas } from './config.data';
   import { useECharts } from '/@/hooks/web/useECharts';
-  import { getDeviceHistoryInfo, getDeviceDataKeys } from '/@/api/alarm/position';
+  import {
+    getDeviceHistoryInfo,
+    getDeviceDataKeys,
+    getDeviceActiveTime,
+  } from '/@/api/alarm/position';
+  import { useDrawer } from '/@/components/Drawer';
+  import DeviceDetailDrawer from '/@/views/device/manage/cpns/modal/DeviceDetailDrawer.vue';
   import moment from 'moment';
   export default defineComponent({
     name: 'BaiduMap',
     components: {
       BasicTable,
       Tag,
+      Alert,
       BasicModal,
       BasicForm,
+      DeviceDetailDrawer,
     },
     props: {
       width: {
@@ -74,7 +90,10 @@
     setup() {
       const wrapRef = ref<HTMLDivElement | null>(null);
       const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
-      const entityId = ref('');
+      const [registerDetailDrawer, { openDrawer }] = useDrawer();
+
+      let entityId = '';
+      let globalRecord: any = {};
       async function initMap() {
         await toPromise();
         await nextTick();
@@ -101,13 +120,14 @@
         },
       });
       // 点击表格某一行触发
-      const deviceRowClick = (record) => {
-        entityId.value = record.tbDeviceId;
+      const deviceRowClick = async (record) => {
+        entityId = record.tbDeviceId;
+        globalRecord = record;
         const BMap = (window as any).BMap;
         const wrapEl = unref(wrapRef);
         const map = new BMap.Map(wrapEl);
         if (record.deviceInfo.address) {
-          const { name, organizationDTO, updateTime, deviceState, deviceProfile } = record;
+          const { name, organizationDTO, deviceState, deviceProfile } = record;
           const { longitude, latitude, address } = record.deviceInfo;
           const point = new BMap.Point(longitude, latitude);
           let options = {
@@ -117,6 +137,10 @@
           map.centerAndZoom(point, 15);
           map.enableScrollWheelZoom(true);
           // 创建信息窗口对象
+          const res = await getDeviceActiveTime(entityId);
+
+          let { value: activeStatus, lastUpdateTs } = res[0];
+          lastUpdateTs = moment(lastUpdateTs).format('YYYY-MM-DD HH:mm:ss');
           let infoWindow = new BMap.InfoWindow(
             `
             <div style="display:flex;justify-content:space-between; margin:20px 0px;">
@@ -132,10 +156,9 @@
             <div>所属组织：${organizationDTO.name}</div>
             <div style="margin-top:6px;">接入协议：${deviceProfile.transportType}</div>
             <div style="margin-top:6px;">设备位置：${address}</div>
-            <div style="margin-top:6px;">下线时间：${updateTime}</div>
-            <div style="display:flex;justify-content:space-between; margin-top:10px">
-              <button style="color:#fff;background-color:#409eff;padding:4px; border-radius:4px;">设备信息</button>
-              <button style="color:#fff;background-color:#409eff;padding:4px; border-radius:4px;">报警记录</button>
+            <div style="margin-top:6px;">${activeStatus ? '在' : '离'}线时间：${lastUpdateTs}</div>
+            <div style="display:flex;justify-content:end; margin-top:10px">
+              <button onclick="openDeviceInfoDrawer()" style="margin-right:10px;color:#fff;background-color:#409eff;padding:4px; border-radius:4px;">设备信息</button>
               <button onclick="openHistoryModal()" style="color:#fff;background-color:#409eff;padding:4px; border-radius:4px;">历史数据</button>
             </div>
             `,
@@ -185,13 +208,20 @@
           endTs = Date.now();
           // 发送请求
           const res = await getDeviceHistoryInfo({
-            entityId: entityId.value,
+            entityId,
             keys: keys.join(),
             startTs,
             endTs,
             interval,
             agg,
           });
+          // 判断对象是否为空
+          if (Object.keys(res).length === 0) {
+            isNull.value = false;
+            return;
+          } else {
+            isNull.value = true;
+          }
           // 处理数据
           for (const key in res) {
             for (const item1 of res[key]) {
@@ -250,24 +280,38 @@
 
       const chartRef = ref<HTMLDivElement | null>(null);
       const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
-
+      const isNull = ref(true);
+      // 设备信息
+      const openDeviceInfoDrawer = async () => {
+        const { id, tbDeviceId } = globalRecord;
+        openDrawer(true, {
+          id,
+          tbDeviceId,
+        });
+      };
       const openHistoryModal = async () => {
         openModal(true);
-
         // 收集参数
         const dataArray: any[] = [];
         const startTs = Date.now() - 86400000; //最近一天
         const endTs = Date.now();
         // 发送请求
-        keys = await getDeviceDataKeys(entityId.value);
+        keys = await getDeviceDataKeys(entityId);
         const res = await getDeviceHistoryInfo({
-          entityId: entityId.value,
+          entityId,
           keys: keys.join(),
           startTs,
           endTs,
           interval: 7200000, //间隔两小时
           agg: 'AVG',
         });
+        // 判断对象是否为空
+        if (Object.keys(res).length === 0) {
+          isNull.value = false;
+          return;
+        } else {
+          isNull.value = true;
+        }
         // 处理数据
         for (const key in res) {
           for (const item1 of res[key]) {
@@ -327,12 +371,14 @@
           agg: 'AVG',
         });
       };
+
       const cancelHistoryModal = () => {
         resetFields();
         setOptions({});
       };
       onMounted(() => {
         initMap();
+        (window as any).openDeviceInfoDrawer = openDeviceInfoDrawer;
         (window as any).openHistoryModal = openHistoryModal;
       });
       return {
@@ -343,7 +389,9 @@
         registerModal,
         registerForm,
         chartRef,
+        isNull,
         cancelHistoryModal,
+        registerDetailDrawer,
       };
     },
   });

@@ -56,6 +56,7 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 6 },
     componentProps: {
+      maxLength: 36,
       placeholder: '请输入联系人姓名',
     },
   },
@@ -70,6 +71,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       placeholder: '请输入联系人姓名',
+      maxLength: 255,
     },
   },
   {
@@ -108,6 +110,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       placeholder: '请输入微信号',
+      maxLength: 255,
     },
   },
   {
@@ -115,7 +118,8 @@ export const formSchema: FormSchema[] = [
     label: '备注',
     component: 'InputTextArea',
     componentProps: {
-      placeholder: '',
+      placeholder: '请输入备注',
+      maxLength: 255,
     },
   },
   {
@@ -123,5 +127,8 @@ export const formSchema: FormSchema[] = [
     label: '',
     component: 'Input',
     show: false,
+    componentProps: {
+      maxLength: 36,
+    },
   },
 ];

+<template>
+  123
+  <div ref="chartRef" :style="{ height, width }"></div>
+</template>
+<script lang="ts" setup>
+  import { ref, Ref, withDefaults } from 'vue';
+  import { useECharts } from '/@/hooks/web/useECharts';
+
+  interface Props {
+    width?: string;
+    height?: string;
+  }
+  withDefaults(defineProps<Props>(), {
+    width: '100%',
+    height: '280px',
+  });
+
+  const chartRef = ref<HTMLDivElement | null>(null);
+  const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
+</script>

 <template>
-  <div class="md:flex justify-between">
-    <template v-for="(item, index) in growCardList" :key="item.title">
-      <div
-        class="growCardItem md:w-1/3 w-full !md:mt-0 !mt-4 bg-white"
-        :class="index === 0 ? '!md:ml-0' : '!md:ml-4'"
+  <div class="md:flex">
+    <Card size="small" class="md:w-1/3 w-full !md:mt-0 !mt-4 !md:mr-4">
+      <div class="flex" style="height: 100px">
+        <div class="mr-4"
+          ><img src="/src/assets/images/device-count.png" style="width: 5rem; height: 5rem"
+        /></div>
+        <div class="flex-auto">
+          <div class="flex justify-between" style="align-items: center">
+            <div style="font-size: 1.625rem; color: #333">{{
+              growCardList?.deviceInfo?.sumCount
+            }}</div>
+            <img src="/src/assets/images/tip.png" style="width: 1.4rem; height: 1.4rem" />
+          </div>
+          <div> 设备数(个) </div>
+          <div class="flex mt-2">
+            <div class="flex mr-1" style="align-items: center; font-size: 0.75rem"
+              ><img src="/src/assets/images/online.png" class="mr-1" />
+              <span>在线{{ growCardList?.deviceInfo?.onLine }}</span>
+            </div>
+            <div class="flex mr-1" style="align-items: center; font-size: 0.75rem">
+              <img src="/src/assets/images/offline.png" class="mr-1" />
+              <span> 离线{{ growCardList?.deviceInfo?.offLine }} </span>
+            </div>
+            <div class="flex mr-1" style="align-items: center; font-size: 0.75rem">
+              <img src="/src/assets/images/inactive.png" class="mr-1" />
+              <span> 未激活{{ growCardList?.deviceInfo?.inActive }} </span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
+        今日新增 {{ growCardList?.deviceInfo?.todayAdd }}</div
+      >
+    </Card>
+    <Card size="small" class="md:w-1/3 w-full !md:mt-0 !mt-4 !md:mr-4">
+      <div class="flex" style="height: 100px">
+        <div class="mr-4">
+          <img
+            v-if="!isAdmin(role)"
+            src="/src/assets/images/alarm-count.png"
+            style="width: 5rem; height: 5rem"
+          />
+          <img v-else src="/src/assets/images/zh.png" style="width: 5rem; height: 5rem" />
+        </div>
+        <div class="flex-auto">
+          <div class="flex justify-between" style="align-items: center">
+            <div v-if="!isAdmin(role)" style="font-size: 1.625rem; color: #333">{{
+              growCardList?.alarmInfo?.sumCount
+            }}</div>
+            <div style="font-size: 1.625rem; color: #333">{{
+              growCardList?.tenantInfo?.sumCount
+            }}</div>
+            <img src="/src/assets/images/tip.png" style="width: 1.4rem; height: 1.4rem" />
+          </div>
+          <div> {{ !isAdmin(role) ? `${currentMonth}月告警数（条）` : '租户总量(个)' }}</div>
+        </div>
+      </div>
+      <div v-if="!isAdmin(role)" class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
+        今日新增 {{ growCardList?.alarmInfo?.todayAdd }}</div
+      >
+      <div v-else class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
+        今日新增 {{ growCardList?.tenantInfo?.todayAdd }}</div
       >
-        <div
-          class="
-            growCardItem-top
-            border border-solid border-t-0 border-r-0 border-l-0 border-b-1
-            dark:border-#ccc
-            light:border-#F2F2F5
-          "
-        >
-          <img :src="item.imgUrl" style="width: 5rem; height: 5rem" />
-          <div class="growCardItem-right">
-            <div class="flex justify-between ml-3">
-              <div style="font-size: 1.625rem; color: #333">{{ item.value }}</div>
-              <img src="../../../../assets/images/tip.png" style="width: 1.4rem; height: 1.4rem" />
+    </Card>
+    <Card size="small" class="md:w-1/3 w-full !md:mt-0 !mt-4">
+      <div class="flex" style="height: 100px">
+        <div class="mr-4"
+          ><img
+            v-if="!isAdmin(role)"
+            src="/src/assets/images/msg-count.png"
+            style="width: 5rem; height: 5rem"
+          /><img v-else src="/src/assets/images/kf.png" style="width: 5rem; height: 5rem" />
+        </div>
+        <div v-if="!isAdmin(role)" style="display: flex; align-items: center">
+          <div>
+            <div class="flex" style="align-items: center">
+              {{ `${currentMonth}月数据点（条）` }}
+              <span style="font-size: 1.625rem; color: #333">
+                {{ growCardList?.messageInfo?.dataPointsCount }}</span
+              >
             </div>
-            <div class="ml-3">{{ item.title }}</div>
-            <div class="ml-1.5 mt-3 flex flex-nowrap" style="width: 15rem" v-if="item.offLine">
-              <div class="count">
-                <img
-                  src="../../../../assets/images/online.png"
-                  style="width: 0.6rem; height: 0.6rem"
-                  class="mr-1"
-                />
-                在线 {{ item.onLine }}
-              </div>
-              <div class="count">
-                <img
-                  src="../../../../assets/images/offline.png"
-                  style="width: 0.6rem; height: 0.6rem"
-                  class="mr-1"
-                />
-                离线 {{ item.offLine }}
-              </div>
-              <div class="count">
-                <img
-                  src="../../../../assets/images/inactive.png"
-                  style="width: 0.6rem; height: 0.6rem"
-                  class="mr-1"
-                />
-                未激活 {{ item.inactive }}
-              </div>
+            <div class="flex" style="align-items: center">
+              {{ `${currentMonth}月消息量（条）` }}
+              <span style="font-size: 1.625rem; color: #333">
+                {{ growCardList?.messageInfo?.messageCount }}</span
+              >
             </div>
           </div>
         </div>
-        <div class="growCardItem-bottom"> 今日新增 {{ item.newDay }}</div>
+        <div class="flex-auto" v-else>
+          <div class="flex justify-between" style="align-items: center">
+            <div style="font-size: 1.625rem; color: #333">{{
+              growCardList?.customerInfo?.sumCount
+            }}</div>
+            <img src="/src/assets/images/tip.png" style="width: 1.4rem; height: 1.4rem" />
+          </div>
+          <div>客户总量(个)</div>
+        </div>
+      </div>
+      <div v-if="!isAdmin(role)" class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
+        今日新增
+        <span class="ml-8">数据点 ({{ growCardList?.messageInfo?.todayDataPointsAdd }})</span>
+        <span class="ml-8">消息量 ({{ growCardList?.messageInfo?.todayMessageAdd }})</span>
       </div>
-    </template>
+      <div v-else class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
+        今日新增 {{ growCardList?.customerInfo?.todayAdd }}</div
+      >
+    </Card>
   </div>
 </template>
 <script lang="ts" setup>
-  import { growCardList } from '../data';
-</script>
-
-<style scoped lang="less">
-  .growCardItem {
-    height: 11.187rem;
-    color: #666;
-    .growCardItem-top {
-      display: flex;
-      margin: 1.25rem;
-      padding-bottom: 0.625rem;
-      .growCardItem-right {
-        width: 18.75rem;
-        .count {
-          display: flex;
-          font-size: 0.75rem;
-          align-items: center;
-          margin-left: 0.5rem;
-        }
-      }
-    }
-    .growCardItem-bottom {
-      margin-left: 1.25rem;
-    }
+  import { ref, onMounted, computed } from 'vue';
+  import { Card } from 'ant-design-vue';
+  import { getHomeData } from '/@/api/dashboard';
+  import { isAdmin } from '/@/enums/roleEnum';
+  defineProps<{
+    role: string;
+  }>();
+  defineExpose({
+    isAdmin,
+  });
+  interface CardList {
+    deviceInfo: {
+      sumCount: number;
+      onLine: number;
+      offLine: number;
+      inActive: number;
+      todayAdd: number;
+    };
+    tenantInfo?: { sumCount: number; todayAdd: number };
+    customerInfo?: { sumCount: number; todayAdd: number };
+    alarmInfo?: {
+      sumCount: number;
+      todayAdd: number;
+    };
+    messageInfo?: {
+      dataPointsCount: number;
+      messageCount: number;
+      todayDataPointsAdd: number;
+      todayMessageAdd: number;
+    };
   }
-</style>
+  const growCardList = ref<CardList>();
+  onMounted(async () => {
+    const res = await getHomeData();
+    growCardList.value = res;
+  });
+  // 获取当前月份0-11    +1
+  const currentMonth = computed(() => {
+    return new Date().getMonth() + 1;
+  });
+</script>

 <template>
-  <Card title="帮助文档">
-    <div>
-      <template v-for="item in helpDoc" :key="item.title">
-        <AnchorLink v-bind="item" />
-      </template>
-    </div>
-    <Card
-      :tab-list="tabListTitle"
-      v-bind="$attrs"
-      :active-tab-key="activeKey"
-      :bordered="false"
-      @tabChange="onTabChange"
-      :bodyStyle="{ padding: 0 }"
-    >
-      <div v-if="activeKey === 'tab1'">
-        <List item-layout="horizontal" :dataSource="dataSource">
-          <template #renderItem="{ item }">
-            <ListItem>
-              <ListItemMeta>
-                <template #avatar>
-                  <Avatar src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" />
-                </template>
-                <template #description>
-                  <span
-                    @click="go('/stationnotification/mynotification')"
-                    class="cursor-pointer noticeTitle"
-                    >{{ item.sysNotice.title }}
-                  </span>
-                </template>
-                <template #title>
-                  <span>{{ item.user.realName }}</span>
+  <div>
+    <Card title="帮助文档" v-if="!isAdmin(role)">
+      <div>
+        <template v-for="item in helpDoc" :key="item.title">
+          <AnchorLink v-bind="item" />
+        </template>
+      </div>
+      <Card
+        v-if="!isAdmin(role)"
+        :tab-list="tabListTitle"
+        v-bind="$attrs"
+        :active-tab-key="activeKey"
+        :bordered="false"
+        @tabChange="onTabChange"
+        :bodyStyle="{ padding: 0 }"
+      >
+        <div v-if="activeKey === 'tab1'">
+          <List item-layout="horizontal" :dataSource="dataSource">
+            <template #renderItem="{ item }">
+              <ListItem>
+                <ListItemMeta>
+                  <template #avatar>
+                    <Avatar
+                      src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+                    />
+                  </template>
+                  <template #description>
+                    <span
+                      class="cursor-pointer noticeTitle"
+                      @click="go('/stationnotification/mynotification')"
+                      >{{ item.sysNotice.title }}
+                    </span>
+                  </template>
+                  <template #title>
+                    <span>{{ item.user.realName }}</span>
+                  </template>
+                </ListItemMeta>
+                <template #extra>
+                  <Time :value="item.sysNotice.senderDate" />
                 </template>
-              </ListItemMeta>
-              <template #extra>
-                <Time :value="item.sysNotice.senderDate" />
-              </template>
-            </ListItem>
-          </template>
-        </List>
-        <Card hoverable title="联系我们" :bordered="false">
-          <template #cover>
-            <img :src="getQrCode" alt="" style="width: 150px; height: 150px; margin: 50px auto" />
-          </template>
-          <CardMeta>
-            <template #description>
-              <p>联系人: {{ getContacts }}</p>
-              <p>联系电话: {{ getTel }}</p>
-              <p>联系地址: {{ getAddress }} </p>
+              </ListItem>
             </template>
-          </CardMeta>
-        </Card>
-      </div>
+          </List>
+          <Card hoverable title="联系我们" :bordered="false">
+            <template #cover>
+              <img :src="getQrCode" alt="" style="width: 150px; height: 150px; margin: 50px auto" />
+            </template>
+            <CardMeta>
+              <template #description>
+                <p>联系人: {{ getContacts }}</p>
+                <p>联系电话: {{ getTel }}</p>
+                <p>联系地址: {{ getAddress }} </p>
+              </template>
+            </CardMeta>
+          </Card>
+        </div>
+      </Card>
+    </Card>
+
+    <Card v-if="isAdmin(role)">
+      <Descriptions title="租户消息量TOP10" :column="1">
+        <template v-for="(item, index) in 10" :key="index">
+          <DescriptionsItem>
+            <span
+              class="mr-2"
+              style="
+                width: 1.25rem;
+                height: 1.25rem;
+                border: 1px solid;
+                color: #0b55f1;
+                border-radius: 50%;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+              "
+              :style="{
+                color:
+                  index === 0
+                    ? '#f0a16e'
+                    : index === 1
+                    ? '#868585'
+                    : index === 2
+                    ? '#e78739'
+                    : '#4e84f5',
+                backgroundColor:
+                  index === 0 ? '#fed36a' : index === 1 ? '#CBCAC9' : index === 2 ? '#F1B889' : '',
+                borderColor:
+                  index === 0
+                    ? '#fdee7d'
+                    : index === 1
+                    ? '#e6e6e5'
+                    : index === 2
+                    ? '#f8c296'
+                    : '#0b55f1;',
+              }"
+              >{{ index + 1 }}</span
+            >兰州天兆猪业</DescriptionsItem
+          >
+        </template>
+      </Descriptions>
+    </Card>
+    <Card v-if="isAdmin(role)">
+      <BasicTable @register="registerTable" />
     </Card>
-  </Card>
+  </div>
 </template>
 
 <script lang="ts">
   import { defineComponent, ref, computed, onMounted } from 'vue';
-  import { Card, AnchorLink, List, ListItem, ListItemMeta, Avatar, CardMeta } from 'ant-design-vue';
+  import { Card, Anchor, List, Avatar, Descriptions } from 'ant-design-vue';
   import { useUserStore } from '/@/store/modules/user';
   import { getEnterPriseDetail } from '/@/api/oem';
   import { notifyMyGetrPageApi } from '/@/api/stationnotification/stationnotifyApi';
   import { Time } from '/@/components/Time';
   import { useGo } from '/@/hooks/web/usePage';
+  import { BasicTable, useTable } from '/@/components/Table';
+  import { columns } from './props';
+  import { isAdmin } from '/@/enums/roleEnum';
+  import { getTenantExpireTimeList } from '/@/api/dashboard';
   export default defineComponent({
     components: {
       Card,
-      AnchorLink,
+      CardMeta: Card.Meta,
+      AnchorLink: Anchor.Link,
       List,
-      ListItem,
-      ListItemMeta,
+      ListItem: List.Item,
+      ListItemMeta: List.Item.Meta,
+      Descriptions,
+      DescriptionsItem: Descriptions.Item,
       Avatar,
       Time,
-      CardMeta,
+      BasicTable,
     },
-    setup() {
-      onMounted(async () => {
-        const res = await getEnterPriseDetail();
-        userStore.setEnterPriseInfo(res);
-      });
+    props: {
+      role: {
+        type: String,
+        required: true,
+      },
+    },
+    setup(props) {
+      // 通知数据
+      const dataSource = ref([]);
+      const go = useGo();
+
       const helpDoc = ref([
         {
           title: '如何接入设备?',
@@ -109,6 +173,18 @@
         activeKey.value = key;
       };
 
+      const [registerTable, { redoHeight }] = useTable({
+        api: getTenantExpireTimeList,
+        title: '本月即将过期租户',
+        showIndexColumn: false,
+        useSearchForm: false,
+        columns,
+        fetchSetting: {
+          listField: 'expireTenant.items',
+          totalField: 'expireTenant.total',
+        },
+      });
+
       const userStore = useUserStore();
       const getContacts = computed(() => {
         return userStore.enterPriseInfo?.contacts;
@@ -122,32 +198,35 @@
       const getQrCode = computed(() => {
         return userStore.enterPriseInfo?.qrCode;
       });
-
-      // 通知数据
-      const dataSource = ref([]);
-      const go = useGo();
       onMounted(async () => {
-        const res = await notifyMyGetrPageApi({ page: 1, pageSize: 5 });
-        dataSource.value = res.items;
+        if (isAdmin(props.role)) return;
+
+        const res = await getEnterPriseDetail();
+        const notice = await notifyMyGetrPageApi({ page: 1, pageSize: 5 });
+        userStore.setEnterPriseInfo(res);
+        dataSource.value = notice.items;
       });
 
       return {
         activeKey,
         tabListTitle,
-        onTabChange,
         helpDoc,
         getQrCode,
         getContacts,
         getAddress,
         getTel,
         dataSource,
+        onTabChange,
         go,
+        registerTable,
+        isAdmin,
+        redoHeight,
       };
     },
   });
 </script>
 
-<style lang="less" scoped>
+<style scoped>
   .noticeTitle:hover {
     border-bottom: 1px solid #ccc;
   }

@@ -4,59 +4,347 @@
     v-bind="$attrs"
     :active-tab-key="activeKey"
     @tabChange="onTabChange"
+    v-if="!isAdmin(role)"
   >
     <template #tabBarExtraContent>
       <div class="extra-date">
-        <template v-for="(item, index) in dateList" :key="item">
-          <span @click="changeDate(index)" :class="{ active: index === activeIndex }">{{
-            item
-          }}</span>
+        <template v-for="(item, index) in dateList" :key="item.value">
+          <span
+            @click="quickQueryDate(index, item.value)"
+            :class="{ active: index === activeIndex }"
+            >{{ item.label }}</span
+          >
         </template>
-        <DatePicker @change="onDateChange" />
+        <DatePicker @change="onDateChange" v-model:value="dateValue" />
       </div>
     </template>
-    <div v-if="activeKey === 'tab1'">
-      <p class="center">告警数</p>
-      <VisitAnalysis />
+    <div v-show="activeKey === '1'">
+      <!-- 折线图 -->
+      <VisitAnalysis :alarmList="state.alarmList" />
     </div>
-    <div v-else>
-      <p class="center">消息数</p>
-      <VisitAnalysisBar />
+    <div v-show="activeKey === '2'">
+      <!-- 柱形图 -->
+      <VisitAnalysisBar :dataPointList="state.dataPointList" :messageList="state.messageList" />
     </div>
   </Card>
+  <Card v-bind="$attrs" v-if="isAdmin(role)" title="租户趋势">
+    <TenantTrend />
+  </Card>
+  <Card v-bind="$attrs" v-if="isAdmin(role)" title="客户趋势">
+    <CustomerTrend />
+  </Card>
 </template>
 <script lang="ts" setup>
-  import { ref } from 'vue';
+  import { ref, reactive } from 'vue';
   import { Card, DatePicker } from 'ant-design-vue';
   import VisitAnalysis from './VisitAnalysis.vue';
   import VisitAnalysisBar from './VisitAnalysisBar.vue';
-
-  const activeKey = ref('tab1');
-
+  import { isAdmin } from '/@/enums/roleEnum';
+  import { useWebSocket } from '@vueuse/core';
+  import { getAuthCache } from '/@/utils/auth';
+  import CustomerTrend from './CustomerTrend.vue';
+  import TenantTrend from './TenantTrend.vue';
+  import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
+  import { formatToDateTime } from '/@/utils/dateUtil';
+  import { getEntitiesId } from '/@/api/dashboard/index';
+  defineExpose({
+    isAdmin,
+  });
+  const props = defineProps<{
+    role: string;
+  }>();
+  const activeKey = ref('1');
+  let entityId = null;
+  // 图表tab切换选项卡
   const tabListTitle = [
     {
-      key: 'tab1',
+      key: '1',
       tab: '告警数统计',
     },
     {
-      key: 'tab2',
+      key: '2',
       tab: '消息量统计',
     },
   ];
-  const dateList = ref(['1小时', '1天', '7天', '30天']);
-  const activeIndex = ref(0);
-  function onTabChange(key) {
+  // 快速选择日期
+  const activeIndex = ref(3);
+  const dateValue = ref();
+  const dateList = ref([
+    { label: '1小时', value: 3600000 },
+    { label: '1天', value: 86400000 },
+    { label: '7天', value: 604800000 },
+    { label: '30天', value: 2592000000 },
+  ]);
+  // web Socket
+  const token: string = getAuthCache(JWT_TOKEN_KEY);
+  const state = reactive({
+    server: `${import.meta.env.VITE_WEB_SOCKET}${token}`,
+    alarmList: new Array<[number, string]>(),
+    alarmItem: new Array<[number, string]>(),
+    dataPointList: new Array<[number, string]>(),
+    messageList: new Array<[number, string]>(),
+    dataPoint: new Array<[number, string]>(),
+    MsgCount: new Array<[number, string]>(),
+  });
+  const { send, close } = useWebSocket(state.server, {
+    async onConnected() {
+      if (isAdmin(props.role)) return;
+      const res = await getEntitiesId();
+      entityId = res.data[0].entityId;
+      const sendValue = JSON.stringify({
+        entityDataCmds: [
+          {
+            query: {
+              entityFilter: {
+                type: 'singleEntity',
+                singleEntity: entityId,
+              },
+              pageLink: {
+                pageSize: 1024,
+                page: 0,
+                sortOrder: {
+                  key: {
+                    type: 'ENTITY_FIELD',
+                    key: 'createdTime',
+                  },
+                  direction: 'DESC',
+                },
+              },
+              entityFields: [
+                {
+                  type: 'ENTITY_FIELD',
+                  key: 'name',
+                },
+                {
+                  type: 'ENTITY_FIELD',
+                  key: 'label',
+                },
+                {
+                  type: 'ENTITY_FIELD',
+                  key: 'additionalInfo',
+                },
+              ],
+              latestValues: [
+                {
+                  type: 'TIME_SERIES',
+                  key: 'createdAlarmsCountHourly',
+                },
+              ],
+            },
+            cmdId: activeKey.value,
+          },
+        ],
+      });
+      const sendValue1 = JSON.stringify({
+        entityDataCmds: [
+          {
+            cmdId: activeKey.value,
+            historyCmd: {
+              keys: ['createdAlarmsCountHourly'],
+              startTs: Date.now() - 2592000000,
+              endTs: Date.now(),
+              interval: 86400000,
+              agg: 'COUNT',
+            },
+          },
+        ],
+      });
+      send(sendValue);
+      send(sendValue1);
+      console.log('建立连接了');
+    },
+    onMessage(_, e) {
+      const { data, update } = JSON.parse(e.data);
+      console.log('来新消息了', data, update);
+      if (activeKey.value === '1') {
+        if (data) {
+          const { createdAlarmsCountHourly } = data.data[0].latest.TIME_SERIES;
+          state.alarmItem = [createdAlarmsCountHourly.ts, createdAlarmsCountHourly.value];
+          state.alarmList.push([createdAlarmsCountHourly.ts, createdAlarmsCountHourly.value]);
+        }
+        if (update) {
+          const { createdAlarmsCountHourly } = update[0].timeseries;
+          const newArray: any = [];
+          for (const item of createdAlarmsCountHourly) {
+            newArray.push([item.ts, item.value]);
+          }
+          state.alarmList = newArray;
+        }
+      } else {
+        if (data) {
+          const { transportDataPointsCountHourly, transportMsgCountHourly } =
+            data.data[0].latest.TIME_SERIES;
+          state.dataPoint = [
+            transportDataPointsCountHourly.ts,
+            transportDataPointsCountHourly.value,
+          ];
+          state.MsgCount = [
+            transportDataPointsCountHourly.ts,
+            transportDataPointsCountHourly.value,
+          ];
+          state.dataPointList.push([
+            transportDataPointsCountHourly.ts,
+            transportDataPointsCountHourly.value,
+          ]);
+          state.messageList.push([transportMsgCountHourly.ts, transportMsgCountHourly.value]);
+        }
+        if (update) {
+          const { transportDataPointsCountHourly, transportMsgCountHourly } = update[0].timeseries;
+          const newArray: any[] = [];
+          const newArray1: any[] = [];
+          for (const item of transportDataPointsCountHourly) {
+            newArray.push([item.ts, item.value]);
+          }
+          for (const item of transportMsgCountHourly) {
+            newArray1.push([item.ts, item.value]);
+          }
+          state.dataPointList = newArray;
+          state.messageList = newArray1;
+        }
+      }
+    },
+    onDisconnected() {
+      console.log('断开连接了');
+      close();
+    },
+  });
+
+  // 切换tab页
+  function onTabChange(key: string) {
     activeKey.value = key;
+    activeIndex.value = 3;
+    dateValue.value = '';
+    const sendValue = JSON.stringify({
+      entityDataCmds: [
+        {
+          cmdId: activeKey.value,
+          historyCmd: {
+            keys:
+              activeKey.value === '1'
+                ? ['createdAlarmsCountHourly']
+                : ['transportMsgCountHourly', 'transportDataPointsCountHourly'],
+            startTs: Date.now() - 2592000000,
+            endTs: Date.now(),
+            interval: 86400000,
+            agg: 'COUNT',
+          },
+        },
+      ],
+    });
+    if (key === '2') {
+      const sendMessageValue = JSON.stringify({
+        entityDataCmds: [
+          {
+            query: {
+              entityFilter: {
+                type: 'singleEntity',
+                singleEntity: entityId,
+              },
+              pageLink: {
+                pageSize: 1024,
+                page: 0,
+                sortOrder: {
+                  key: {
+                    type: 'ENTITY_FIELD',
+                    key: 'createdTime',
+                  },
+                  direction: 'DESC',
+                },
+              },
+              entityFields: [
+                {
+                  type: 'ENTITY_FIELD',
+                  key: 'name',
+                },
+                {
+                  type: 'ENTITY_FIELD',
+                  key: 'label',
+                },
+                {
+                  type: 'ENTITY_FIELD',
+                  key: 'additionalInfo',
+                },
+              ],
+              latestValues: [
+                {
+                  type: 'TIME_SERIES',
+                  key: 'transportMsgCountHourly',
+                },
+                {
+                  type: 'TIME_SERIES',
+                  key: 'transportDataPointsCountHourly',
+                },
+              ],
+            },
+            cmdId: activeKey.value,
+          },
+        ],
+      });
+      send(sendMessageValue);
+    }
+    send(sendValue);
   }
-  function onDateChange(date, dateString) {
-    console.log(date, dateString);
+  // 选择日期
+  function onDateChange(_, dateString) {
+    activeIndex.value = -1;
+    const dateTime = Number(formatToDateTime(dateString, 'x'));
+    // 动态发送ws数据
+    const sendValue = JSON.stringify({
+      entityDataCmds: [
+        {
+          cmdId: activeKey.value,
+          historyCmd: {
+            keys:
+              activeKey.value === '1'
+                ? ['createdAlarmsCountHourly']
+                : ['transportMsgCountHourly', 'transportDataPointsCountHourly'],
+            startTs: dateTime,
+            endTs: dateTime + 86400000,
+            interval: 7200000,
+            limit: 12,
+            agg: 'COUNT',
+          },
+        },
+      ],
+    });
+    send(sendValue);
   }
-  function changeDate(index: number) {
+  // 快速选择时间
+  function quickQueryDate(index: number, value: number) {
+    if (activeIndex.value === index) return;
     activeIndex.value = index;
+    dateValue.value = '';
+    let interval = 300000;
+    if (value === 86400000) {
+      interval = 7200000;
+    } else if (value === 604800000 || value === 2592000000) {
+      interval = 86400000;
+    }
+    // 动态发送ws数据
+    const sendValue = JSON.stringify({
+      entityDataCmds: [
+        {
+          cmdId: activeKey.value,
+          historyCmd: {
+            keys:
+              activeKey.value === '1'
+                ? ['createdAlarmsCountHourly']
+                : ['transportMsgCountHourly', 'transportDataPointsCountHourly'],
+            startTs: Date.now() - value,
+            endTs: Date.now(),
+            interval,
+            agg: 'COUNT',
+          },
+        },
+      ],
+    });
+    send(sendValue);
+
+    console.log(JSON.parse(sendValue), '----interval', state.alarmList);
   }
 </script>
 
-<style scoped lang="less">
+<style lang="less">
   .center {
     display: flex;
     justify-content: center;

+<template>
+  123
+  <div ref="chartRef" :style="{ height, width }"></div>
+</template>
+<script lang="ts" setup>
+  import { ref, Ref, withDefaults } from 'vue';
+  import { useECharts } from '/@/hooks/web/useECharts';
+
+  interface Props {
+    width?: string;
+    height?: string;
+  }
+  withDefaults(defineProps<Props>(), {
+    width: '100%',
+    height: '280px',
+  });
+
+  const chartRef = ref<HTMLDivElement | null>(null);
+  const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
+</script>

 <template>
-  <div ref="chartRef" :style="{ height, width }"></div>
+  <div>
+    <p class="center">告警数</p>
+    <div ref="chartRef" :style="{ height, width }" v-show="alarmList.length"></div>
+    <div v-show="!alarmList.length">暂无数据</div>
+  </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, Ref } from 'vue';
+  import { onMounted, ref, Ref, withDefaults, watch } from 'vue';
   import { useECharts } from '/@/hooks/web/useECharts';
-  import { basicProps } from './props';
 
-  defineProps({
-    ...basicProps,
+  interface Props {
+    width?: string;
+    height?: string;
+    alarmList: [number, string][];
+  }
+  const props = withDefaults(defineProps<Props>(), {
+    width: '100%',
+    height: '280px',
+    alarmList: () => [],
   });
+
   const chartRef = ref<HTMLDivElement | null>(null);
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
 
@@ -16,79 +27,60 @@
     setOptions({
       tooltip: {
         trigger: 'axis',
-        axisPointer: {
-          lineStyle: {
-            width: 1,
-            color: '#019680',
-          },
-        },
       },
+      grid: {
+        left: '3%',
+        right: '4%',
+        bottom: '3%',
+        containLabel: true,
+      },
+
       xAxis: {
-        type: 'category',
-        boundaryGap: false,
-        data: [
-          '6:00',
-          '7:00',
-          '8:00',
-          '9:00',
-          '10:00',
-          '11:00',
-          '12:00',
-          '13:00',
-          '14:00',
-          '15:00',
-          '16:00',
-          '17:00',
-          '18:00',
-          '19:00',
-          '20:00',
-          '21:00',
-          '22:00',
-          '23:00',
-        ],
-        splitLine: {
-          show: true,
-          lineStyle: {
-            width: 1,
-            type: 'solid',
-            color: 'rgba(226,226,226,0.5)',
-          },
-        },
-        axisTick: {
-          show: false,
-        },
+        type: 'time',
+      },
+      yAxis: {
+        type: 'value',
       },
-      yAxis: [
-        {
-          type: 'value',
-          max: 80000,
-          splitNumber: 4,
-          axisTick: {
-            show: false,
-          },
-          splitArea: {
-            show: true,
-            areaStyle: {
-              color: ['rgba(255,255,255,0.2)', 'rgba(226,226,226,0.2)'],
-            },
-          },
-        },
-      ],
-      grid: { left: '1%', right: '1%', top: '2  %', bottom: 0, containLabel: true },
       series: [
         {
-          smooth: true,
-          data: [
-            111, 222, 4000, 18000, 33333, 55555, 66666, 33333, 14000, 36000, 66666, 44444, 22222,
-            11111, 4000, 2000, 500, 333, 222, 111,
-          ],
-          type: 'line',
-          areaStyle: {},
-          itemStyle: {
-            color: '#5ab1ef',
-          },
+          name: '告警数',
+          type: 'bar',
+          stack: 'Total',
+          data: props.alarmList,
         },
       ],
     });
   });
+  watch(
+    () => props.alarmList,
+    (newValue) => {
+      console.log(newValue);
+      setOptions({
+        tooltip: {
+          trigger: 'axis',
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true,
+        },
+
+        xAxis: {
+          type: 'time',
+        },
+        yAxis: {
+          type: 'value',
+        },
+        series: [
+          {
+            name: '告警数',
+            type: 'bar',
+            stack: 'Total',
+            data: newValue,
+          },
+        ],
+      });
+    }
+  );
 </script>

 <template>
-  <div ref="chartRef" :style="{ height, width }"></div>
+  <div>
+    <p class="center">消息量</p>
+    <div ref="chartRef" :style="{ height, width }" v-show="dataPointList.length"></div>
+    <div v-show="!dataPointList.length">暂无数据</div>
+  </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, Ref } from 'vue';
+  import { ref, Ref, watch, withDefaults } from 'vue';
   import { useECharts } from '/@/hooks/web/useECharts';
-  import { basicProps } from './props';
-
-  defineProps({
-    ...basicProps,
+  type DataItem = [number, string];
+  interface Props {
+    width?: string;
+    height?: string;
+    dataPointList: DataItem[];
+    messageList: DataItem[];
+  }
+  const props = withDefaults(defineProps<Props>(), {
+    width: '100%',
+    height: '280px',
+    dataPointList: () => [],
+    messageList: () => [],
   });
-
   const chartRef = ref<HTMLDivElement | null>(null);
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
-  onMounted(() => {
-    setOptions({
-      tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-          lineStyle: {
-            width: 1,
-            color: '#019680',
+  watch(
+    () => [props.dataPointList, props.messageList],
+    ([newValue, newValue1]) => {
+      // 计算总量
+      let dataPointTotal = 0;
+      let messageTotal = 0;
+      for (const item of newValue) {
+        dataPointTotal += Number(item[1]);
+      }
+      for (const item of newValue1) {
+        messageTotal += Number(item[1]);
+      }
+      setOptions({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow',
           },
         },
-      },
-      grid: { left: '1%', right: '1%', top: '2  %', bottom: 0, containLabel: true },
-      xAxis: {
-        type: 'category',
-        data: [
-          '1月',
-          '2月',
-          '3月',
-          '4月',
-          '5月',
-          '6月',
-          '7月',
-          '8月',
-          '9月',
-          '10月',
-          '11月',
-          '12月',
-        ],
-      },
-      yAxis: {
-        type: 'value',
-        max: 8000,
-        splitNumber: 4,
-      },
-      series: [
-        {
-          data: [3000, 2000, 3333, 5000, 3200, 4200, 3200, 2100, 3000, 5100, 6000, 3200, 4800],
-          type: 'bar',
-          barMaxWidth: 80,
+        xAxis: {
+          type: 'time',
         },
-      ],
-    });
-  });
+        legend: {
+          data: ['传输数据点', '传输消息量'],
+          left: '5%',
+          orient: 'vertical',
+          formatter: (name) => {
+            return name === '传输数据点' ? `${name} ${dataPointTotal}` : `${name} ${messageTotal}`;
+          },
+        },
+
+        yAxis: {},
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true,
+        },
+        series: [
+          {
+            name: '传输数据点',
+            type: 'bar',
+            stack: 'total',
+            data: newValue,
+            color: '#9fe080',
+          },
+          {
+            name: '传输消息量',
+            type: 'bar',
+            stack: 'total',
+            data: newValue1,
+            color: '#5c7bd9',
+          },
+        ],
+      });
+    }
+  );
 </script>

 import { PropType } from 'vue';
-
+import type { BasicColumn } from '/@/components/Table';
 export interface BasicProps {
   width: string;
   height: string;
@@ -14,3 +14,16 @@ export const basicProps = {
     default: '280px',
   },
 };
+
+export const columns: BasicColumn[] = [
+  {
+    title: '租户名称',
+    dataIndex: 'name',
+    width: 120,
+  },
+  {
+    title: '过期时间',
+    dataIndex: 'tenantExpireTime',
+    width: 120,
+  },
+];

-export interface GrowCardItem {
-  imgUrl: string;
-  title: string;
-  value: string;
-  onLine?: number;
-  offLine?: number;
-  inactive?: number;
-  newDay: string;
-}
-
-export const growCardList: GrowCardItem[] = [
-  {
-    imgUrl: '/src/assets/images/device-count.png',
-    title: '设备数（个）',
-    value: '10,000',
-    onLine: 2000,
-    offLine: 3000,
-    inactive: 4000,
-    newDay: '123,45',
-  },
-  {
-    imgUrl: '/src/assets/images/alarm-count.png',
-    title: '11月告警数（条）',
-    value: '11,000',
-    newDay: '167,45',
-  },
-  {
-    imgUrl: '/src/assets/images/msg-count.png',
-    title: '11月消息量（条）',
-    value: '12,000',
-    newDay: '198,45',
-  },
-];

 <template>
   <div class="p-4 md:flex">
     <div class="md:w-7/10 w-full !mr-4 enter-y">
-      <GrowCard :loading="loading" class="enter-y" />
-      <SiteAnalysis class="!my-4 enter-y" :loading="loading" />
-      <div class="md:flex enter-y">
+      <GrowCard :loading="loading" class="enter-y" :role="role" />
+      <SiteAnalysis class="!my-4 enter-y" :loading="loading" :role="role" />
+      <div class="md:flex enter-y" v-if="!isAdmin(role)">
         <Card title="核心流程指南" style="width: 100%">
-          <img alt="核心流程指南" src="../../../assets/images/flow.png" />
+          <img alt="核心流程指南" src="/src/assets/images/flow.png" />
         </Card>
       </div>
     </div>
     <div class="md:w-3/10 w-full enter-y">
-      <HelpDoc />
+      <HelpDoc :role="role" />
     </div>
   </div>
 </template>
@@ -20,8 +20,19 @@
   import SiteAnalysis from './components/SiteAnalysis.vue';
   import { Card } from 'ant-design-vue';
   import HelpDoc from './components/HelpDoc.vue';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
+  import { isAdmin } from '/@/enums/roleEnum';
+  defineExpose({
+    isAdmin,
+  });
 
+  const userInfo: any = getAuthCache(USER_INFO_KEY);
+  const role: string = userInfo.roles[0];
   const loading = ref(true);
+
+  console.log(role);
+
   setTimeout(() => {
     loading.value = false;
   }, 1500);

@@ -3,6 +3,7 @@ import { findDictItemByCode } from '/@/api/system/dict';
 import { deviceProfile } from '/@/api/device/deviceManager';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
+
 // 第一步的表单
 export const step1Schemas: FormSchema[] = [
   {
@@ -17,6 +18,7 @@ export const step1Schemas: FormSchema[] = [
     required: true,
     component: 'Input',
     componentProps: {
+      placeholder: '设备名称',
       maxLength: 30,
     },
   },
@@ -26,6 +28,7 @@ export const step1Schemas: FormSchema[] = [
     required: true,
     component: 'ApiSelect',
     componentProps: {
+      placeholder: '设备类型',
       api: findDictItemByCode,
       params: {
         dictCode: 'device_type',
@@ -64,6 +67,20 @@ export const step1Schemas: FormSchema[] = [
     component: 'Input',
     componentProps: {
       maxLength: 255,
+      placeholder: '请输入设备标签',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 255) {
+              return Promise.reject('字数不超过255个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
     },
   },
   {
@@ -76,24 +93,92 @@ export const step1Schemas: FormSchema[] = [
     field: 'description',
     label: '备注',
     component: 'InputTextArea',
+    componentProps: {
+      maxLength: 500,
+      placeholder: '请输入备注',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 500) {
+              return Promise.reject('字数不超过500个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
   {
     field: 'id',
     label: 'id',
     component: 'Input',
     show: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入id',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 36) {
+              return Promise.reject('字数不超过36个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
   {
     field: 'tenantId',
     label: '租户Code',
     component: 'Input',
     show: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入租户Code',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 36) {
+              return Promise.reject('字数不超过36个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
   {
     field: 'tbDeviceId',
     label: 'tbDeviceId',
     component: 'Input',
     show: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入tbDeviceId',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 36) {
+              return Promise.reject('字数不超过36个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
 ];
 
@@ -244,6 +329,10 @@ export const step2Schemas: FormSchema[] = [
     field: 'credentialsId',
     required: true,
     ifShow: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入访问令牌',
+    },
   },
   {
     label: 'RSA公钥',
@@ -251,6 +340,10 @@ export const step2Schemas: FormSchema[] = [
     field: 'publicKey',
     required: true,
     ifShow: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入RSA公钥',
+    },
   },
   {
     label: '客户端ID',
@@ -258,6 +351,10 @@ export const step2Schemas: FormSchema[] = [
     field: 'clientId',
     required: true,
     ifShow: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入客户端ID',
+    },
   },
   {
     label: '用户名',
@@ -265,11 +362,32 @@ export const step2Schemas: FormSchema[] = [
     field: 'username',
     required: true,
     ifShow: false,
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入用户名',
+    },
   },
   {
     label: '密码',
     component: 'InputPassword',
     field: 'password',
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入密码',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 36) {
+              return Promise.reject('字数不超过36个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
     ifShow: false,
   },
 ];
@@ -409,6 +527,10 @@ export const TokenSchemas: FormSchema[] = [
     field: 'credentialsId',
     required: true,
     ifShow: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入访问令牌',
+    },
   },
   {
     label: 'RSA公钥',
@@ -416,6 +538,10 @@ export const TokenSchemas: FormSchema[] = [
     field: 'publicKey',
     required: true,
     ifShow: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入RSA公钥',
+    },
   },
   {
     label: '客户端ID',
@@ -423,6 +549,10 @@ export const TokenSchemas: FormSchema[] = [
     field: 'clientId',
     required: true,
     ifShow: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入客户端ID',
+    },
   },
   {
     label: '用户名',
@@ -430,23 +560,78 @@ export const TokenSchemas: FormSchema[] = [
     field: 'username',
     required: true,
     ifShow: false,
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入用户名',
+    },
   },
   {
     label: '密码',
     component: 'InputPassword',
     field: 'password',
     ifShow: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入密码',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 36) {
+              return Promise.reject('字数不超过36个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
   {
     label: 'id',
     component: 'Input',
     field: 'id',
     show: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入id',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 36) {
+              return Promise.reject('字数不超过36个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
   {
     label: 'tbDeviceId',
     component: 'Input',
     field: 'tbDeviceId',
     show: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入tbDeviceId',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 36) {
+              return Promise.reject('字数不超过36个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
 ];

 import { formatToDateTime } from '/@/utils/dateUtil';
 import { FormSchema } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
+
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 
 export const columns: BasicColumn[] = [
@@ -8,25 +9,20 @@ export const columns: BasicColumn[] = [
     title: '设备名称',
     dataIndex: 'name',
     width: 120,
-    key: 'name',
   },
   {
     title: '设备标签',
     dataIndex: 'label',
     width: 100,
-    key: 'label',
   },
   {
     title: '设备配置',
     dataIndex: 'deviceProfile.name',
     width: 160,
-    key: 'deviceProfile.name',
   },
-
   {
     title: '设备类型',
     dataIndex: 'deviceType',
-    key: 'deviceType',
     customRender({ text }) {
       return text === DeviceTypeEnum.GATEWAY
         ? '网关设备'
@@ -39,7 +35,6 @@ export const columns: BasicColumn[] = [
     title: '描述',
     dataIndex: 'description',
     width: 180,
-    key: 'description',
   },
 ];
 // 实时数据表格
@@ -95,6 +90,9 @@ export const alarmSearchSchemas: FormSchema[] = [
     label: '告警类型',
     component: 'Input',
     colProps: { span: 6 },
+    componentProps: {
+      maxLength: 36,
+    },
   },
   {
     field: 'endTime',
@@ -208,6 +206,9 @@ export const alarmSchemasForm: FormSchema[] = [
     field: 'details',
     label: '详情',
     component: 'InputTextArea',
+    componentProps: {
+      maxLength: 255,
+    },
   },
 ];
 
@@ -218,12 +219,18 @@ export const childDeviceSchemas: FormSchema[] = [
     label: '设备配置',
     component: 'Select',
     colProps: { span: 12 },
+    componentProps: {
+      maxLength: 255,
+    },
   },
   {
     field: 'icon',
     label: '设备名称',
     component: 'Input',
     colProps: { span: 12 },
+    componentProps: {
+      maxLength: 255,
+    },
   },
 ];
 export const childDeviceColumns: BasicColumn[] = [

+import { formatToDate } from '/@/utils/dateUtil';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { DeviceTypeEnum, DeviceState } from '/@/api/device/model/deviceModel';
+
 // 表格列数据
 export const columns: BasicColumn[] = [
   {
@@ -19,6 +21,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'deviceProfile.name',
     width: 160,
     slots: { customRender: 'deviceProfile' },
+    ellipsis: true,
   },
 
   {
@@ -36,10 +39,16 @@ export const columns: BasicColumn[] = [
     width: 120,
     slots: { customRender: 'deviceState' },
   },
-
   {
     title: '最后连接时间',
-    dataIndex: 'lastConnectTime',
+    dataIndex: 'lastOnlineTime',
+    format: (text) => formatToDate(text, 'YYYY-MM-DD HH:mm:ss'),
+    width: 180,
+  },
+  {
+    title: '最后断开时间',
+    dataIndex: 'lastOfflineTime',
+    format: (text) => formatToDate(text, 'YYYY-MM-DD HH:mm:ss'),
     width: 180,
   },
 ];
@@ -76,6 +85,23 @@ export const searchFormSchema: FormSchema[] = [
     field: 'name',
     label: '设备名称',
     component: 'Input',
-    colProps: { span: 6 },
+    colProps: { span: 7 },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入设备名称',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 255) {
+              return Promise.reject('字数不超过255个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
 ];

@@ -6,7 +6,7 @@
     :destroyOnClose="true"
     @close="closeDrawer"
     :title="deviceDetail.name"
-    width="78%"
+    width="70%"
   >
     <Tabs v-model:activeKey="activeKey" :size="size" type="card">
       <TabPane key="1" tab="详情"
@@ -26,7 +26,7 @@
   import { defineComponent, ref } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
 
-  import { Tabs, TabPane } from 'ant-design-vue';
+  import { Tabs } from 'ant-design-vue';
   import Detail from '../tabs/Detail.vue';
   import RealTimeData from '../tabs/RealTimeData.vue';
   import Alarm from '../tabs/Alarm.vue';
@@ -37,13 +37,12 @@
     components: {
       BasicDrawer,
       Tabs,
-      TabPane,
+      TabPane: Tabs.TabPane,
       Detail,
       RealTimeData,
       Alarm,
       ChildDevice,
     },
-
     emits: ['reload', 'register'],
     setup() {
       const activeKey = ref('1');

@@ -39,9 +39,10 @@
   import { createOrEditDevice } from '/@/api/device/deviceManager';
   import DeviceStep1 from '../step/DeviceStep1.vue';
   import DeviceStep2 from '../step/DeviceStep2.vue';
-  import { Steps, Step } from 'ant-design-vue';
+  import { Steps } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { credentialTypeEnum } from '../../config/data';
+
   export default defineComponent({
     name: 'DeviceModal',
     components: {
@@ -49,7 +50,7 @@
       DeviceStep1,
       DeviceStep2,
       Steps,
-      Step,
+      Step: Steps.Step,
     },
     props: {
       userData: { type: Object },

@@ -44,6 +44,13 @@
           labelWidth: 120,
           schemas: alarmSearchSchemas,
         },
+        showTableSetting: true,
+        tableSetting: {
+          redo: true,
+          size: false,
+          setting: false,
+          fullScreen: false,
+        },
         useSearchForm: true,
         bordered: true,
         showIndexColumn: false,

@@ -10,8 +10,8 @@
         bordered
         :columns="columns"
         :data-source="[deviceDetail]"
+        :rowKey="(_, index) => index"
         :pagination="false"
-        rowKey="tbDeviceId"
         style="width: 800px"
       />
     </div>
@@ -23,7 +23,7 @@
     </div>
     <div v-if="deviceDetail?.deviceInfo?.address" class="mt-4">
       <p>设备位置</p>
-      <div ref="wrapRef" style="height: 400px; width: 90%"></div>
+      <div ref="wrapRef" style="height: 400px; width: 100%"></div>
     </div>
   </div>
 </template>

@@ -24,7 +24,7 @@
     setup(props) {
       const token: string = getAuthCache(JWT_TOKEN_KEY);
       const state = reactive({
-        server: `ws://101.133.234.90:8080/api/ws/plugins/telemetry?token=${token}`,
+        server: `${import.meta.env.VITE_WEB_SOCKET}${token}`,
         sendValue: JSON.stringify({
           attrSubCmds: [],
           tsSubCmds: [

@@ -8,7 +8,7 @@
     @cancel="handleCancel"
   >
     <div class="step-form-form">
-      <a-steps :current="current">
+      <a-steps :current="current" @change="handleChange">
         <a-step title="设备配置" />
         <a-step title="传输配置" />
         <a-step title="告警配置" />
@@ -34,10 +34,9 @@
           @next="handleStep3Next"
           @redo="handleRedo"
       /></div>
-
       <div v-show="current === 3">
-        <DeviceProfileStep4 ref="DeviceProfileStep4Ref" @prev="handleStepPrev"
-      /></div>
+        <DeviceProfileStep4 ref="DeviceProfileStep4Ref" @prev="handleStepPrev" />
+      </div>
     </div>
   </BasicModal>
 </template>
@@ -86,13 +85,21 @@
       const current = ref(0);
       const isUpdate = ref(true);
       const getTitle = computed(() => (!unref(isUpdate) ? '新增设备配置' : '编辑设备配置'));
+      const handleChange = (v) => {
+        console.log(v);
+      };
       const [register, { closeModal }] = useModalInner(async (data) => {
         isUpdate.value = !!data?.isUpdate;
         if (!unref(isUpdate)) {
           current.value = 0;
+          proxy.$refs.DeviceProfileStep3Ref.clearProfileDataFunc();
+          proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
+          // proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc();
+
           switch (current.value) {
             case 0:
               proxy.$refs.DeviceProfileStep1Ref.customResetFunc();
+              proxy.$refs.DeviceProfileStep1Ref.resetIconFunc();
               break;
             case 1:
               proxy.$refs.DeviceProfileStep2Ref.customResetAndFunc();
@@ -109,32 +116,15 @@
         }
         if (unref(isUpdate)) {
           current.value = 0;
+          proxy.$refs.DeviceProfileStep3Ref.clearProfileDataFunc();
+          proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
           postEditId.value = data.record.id;
           const getBackendData = await deviceConfigGetDetail(postEditId.value);
           editEchoData.value = { ...getBackendData };
-          console.log(editEchoData.value);
           switch (current.value) {
             case 0:
               proxy.$refs.DeviceProfileStep1Ref.resetFieldsFunc(editEchoData.value);
-              break;
-            case 1:
-              proxy.$refs.DeviceProfileStep2Ref.resetFieldsFunc({
-                transportType: editEchoData.value.profileData.transportConfiguration.type,
-              });
-              break;
-            case 2:
-              proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormFunc({
-                alarmType: editEchoData.value.profileData?.alarms[0].alarmType,
-              });
-              proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormHighSettingmFunc(
-                editEchoData.value
-              );
-              proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormCreateAlarmFunc(
-                editEchoData.value
-              );
-              break;
-            case 3:
-              proxy.$refs.DeviceProfileStep4Ref.resetFieldsFunc(editEchoData.value);
+              proxy.$refs.DeviceProfileStep1Ref.editIconFunc(editEchoData.value.icon);
               break;
           }
         }
@@ -142,18 +132,132 @@
       function handleStepPrev() {
         current.value--;
       }
-      function handleStepNext1(v) {
+      function handleStepNext1(v, v1) {
+        console.log(v, v1);
         current.value++;
         getStepOneData.value = v;
+        getStepOneData.value.icon = v1;
+        console.log(getStepOneData.value);
+        if (unref(isUpdate)) {
+          proxy.$refs.DeviceProfileStep2Ref.resetFieldsFunc({
+            transportType: editEchoData.value.profileData.transportConfiguration.type,
+          });
+        } else {
+          // proxy.$refs.DeviceProfileStep2Ref.customResetAndFunc();
+        }
       }
       function handleStep2Next(v) {
         current.value++;
+
         getStepTwoData.value = v;
-        proxy.$refs.DeviceProfileStep3Ref.addAlarmRule();
+        if (unref(isUpdate)) {
+          proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormFunc({
+            alarmType: editEchoData.value.profileData.alarms[0].alarmType,
+          });
+          proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormHighSettingmFunc({
+            propagate: editEchoData.value.profileData.alarms[0].propagate,
+            propagateRelationTypes:
+              editEchoData.value.profileData?.alarms[0].propagateRelationTypes,
+          });
+          const getKey = Object.keys(editEchoData.value.profileData?.alarms[0].createRules);
+          proxy.$refs.DeviceProfileStep3Ref.retryRegisterFormCreateAlarmFunc({
+            default: getKey[0],
+          });
+          const findDay = [
+            { label: '等于', value: 'EQUAL' },
+            { label: '不等于', value: 'NOT_EQUAL' },
+            { label: '开始于', value: 'STARTS_WITH' },
+            { label: '结束于', value: 'ENDS_WITH' },
+            { label: '包含', value: 'CONTAINS' },
+            { label: '不包含', value: 'NOT_CONTAINS' },
+            { label: '等于', value: 'EQUAL' },
+            { label: '不等于', value: 'NOT_EQUAL' },
+            { label: '大于', value: 'GREATER' },
+            { label: '小于', value: 'LESS' },
+            { label: '大于或等于', value: 'GREATER_OR_EQUAL' },
+            { label: '小于或等于', value: 'LESS_OR_EQUAL' },
+          ];
+          const findRuleByValue = findDay.find((f) => {
+            if (
+              f.value ==
+              editEchoData.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                .condition[0].predicate.operation
+            ) {
+              return f.label;
+            }
+          });
+          const findClearRuleByValue = findDay.find((f) => {
+            if (
+              f.value ==
+              editEchoData.value.profileData?.alarms[0].clearRule.condition.condition[0].predicate
+                .operation
+            ) {
+              return f.label;
+            }
+          });
+          proxy.$refs.DeviceProfileStep3Ref.retryRulesFormDataFunc(
+            `
+            键名:${
+              editEchoData.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                .condition[0].key.key
+            }...操作:${findRuleByValue?.label}...值:${
+              editEchoData.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                .condition[0].predicate.value.defaultValue
+            }
+            `
+          );
+          proxy.$refs.DeviceProfileStep3Ref.retryEnableFormDataFunc(`始终启用`);
+          proxy.$refs.DeviceProfileStep3Ref.retryTemplateFormDataFunc(
+            `
+           报警详细信息:${
+             editEchoData.value.profileData?.alarms[0].createRules[getKey[0]].alarmDetails
+           }
+           `
+          );
+          //清除报警
+          proxy.$refs.DeviceProfileStep3Ref.retryRulesClearFormDataFunc(
+            `
+            键名:${editEchoData.value.profileData?.alarms[0].clearRule.condition.condition[0].key.key}...操作:${findClearRuleByValue?.label}...值:${editEchoData.value.profileData?.alarms[0].clearRule.condition.condition[0].predicate.value.defaultValue}
+            `
+          );
+          proxy.$refs.DeviceProfileStep3Ref.retryEnableClearFormDataFunc(`始终启用`);
+          proxy.$refs.DeviceProfileStep3Ref.retryTemplateClearFormDataFunc(
+            `
+           报警详细信息:${editEchoData.value.profileData?.alarms[0].clearRule.alarmDetails}
+           `
+          );
+        } else {
+          proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormHighSettingmFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetRegisterFormCreateAlarmFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetRulesFormDataFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetEnableFormDataFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetTemplateFormDataFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetRulesClearFormDataFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetEnableClearFormDataFunc();
+          proxy.$refs.DeviceProfileStep3Ref.resetTemplateClearFormDataFunc();
+        }
       }
       function handleStep3Next(v) {
         current.value++;
         getStepThreeData.value = v;
+        try {
+          if (unref(isUpdate)) {
+            setTimeout(() => {
+              proxy.$refs.DeviceProfileStep4Ref.resetFieldsFunc({
+                alarmContactId: editEchoData.value.alarmProfile.alarmContactId,
+                messageMode: editEchoData.value.alarmProfile.messageMode,
+              });
+            }, 1000);
+          }
+          // if (!unref(isUpdate)) {
+          //   setTimeout(() => {
+          //     proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc();
+          //   }, 1000);
+          // }
+        } catch (e) {
+          return e;
+        }
       }
       function handleRedo() {
         current.value = 0;
@@ -197,6 +301,7 @@
         return;
       };
       return {
+        handleChange,
         DeviceProfileStep2Ref,
         DeviceProfileStep3Ref,
         DeviceProfileStep4Ref,

@@ -2,8 +2,9 @@ import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { MessageEnum } from '/@/enums/messageEnum';
-import { getOrganizationList } from '/@/api/system/system';
-import { copyTransFun } from '/@/utils/fnUtils';
+// import { getOrganizationList } from '/@/api/system/system';
+// import { copyTransFun } from '/@/utils/fnUtils';
+import { numberRule } from '/@/utils/rules';
 
 export const columns: BasicColumn[] = [
   {
@@ -30,23 +31,27 @@ export const columns: BasicColumn[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'organizationId',
-    label: '请选择组织',
-    component: 'ApiTreeSelect',
-    colProps: { span: 6 },
-    componentProps: {
-      api: async () => {
-        const data = await getOrganizationList();
-        copyTransFun(data as any as any[]);
-        return data;
-      },
-    },
-  },
-  {
     field: 'name',
     label: '配置名称',
     component: 'Input',
     colProps: { span: 8 },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入配置名称',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 255) {
+              return Promise.reject('字数不超过255个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
 ];
 
@@ -63,6 +68,10 @@ export const formSchema: FormSchema[] = [
     label: '配置名称',
     required: true,
     component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入配置名称',
+    },
   },
   {
     field: 'messageType',
@@ -98,6 +107,11 @@ export const formSchema: FormSchema[] = [
     label: 'accessKeyId',
     required: true,
     component: 'Input',
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入accessKeyId',
+    },
+
     ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
   {
@@ -105,6 +119,11 @@ export const formSchema: FormSchema[] = [
     label: 'accessKeySecret',
     required: true,
     component: 'Input',
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入accessKeySecret',
+    },
+
     ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
   {
@@ -113,6 +132,11 @@ export const formSchema: FormSchema[] = [
     defaultValue: 'smtp.163.com',
     required: true,
     component: 'Input',
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入accessKeySecret',
+    },
+
     ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
   },
   {
@@ -121,6 +145,12 @@ export const formSchema: FormSchema[] = [
     defaultValue: 25,
     required: true,
     component: 'InputNumber',
+    rules: numberRule,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入端口',
+    },
+
     ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
   },
   {
@@ -128,6 +158,11 @@ export const formSchema: FormSchema[] = [
     label: '用户名',
     required: true,
     component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入用户名',
+    },
+
     ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
   },
   {
@@ -142,12 +177,46 @@ export const formSchema: FormSchema[] = [
     label: '消息配置',
     component: 'Input',
     show: false,
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入消息配置',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 255) {
+              return Promise.reject('字数不超过255个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
   {
     field: 'id',
     label: '主键',
     component: 'Input',
     show: false,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入主键',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 36) {
+              return Promise.reject('字数不超过36个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
   {
     field: 'status',
@@ -165,5 +234,22 @@ export const formSchema: FormSchema[] = [
     label: '备注',
     field: 'remark',
     component: 'InputTextArea',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入备注',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 255) {
+              return Promise.reject('字数不超过255个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
 ];

@@ -21,65 +21,69 @@
         /></TabPane>
         <TabPane key="3" tab="报警规则">
           <div style="padding-top: 10px">
-            <div style="border-radius: 10px; border: 1px solid grey">
-              <BasicForm
-                :showSubmitButton="false"
-                :showResetButton="false"
-                @register="registerStep3Schemas"
-              />
-              <BasicForm
-                :showSubmitButton="false"
-                :showResetButton="false"
-                @register="registerStep3HighSetting"
-              />
-              <BasicForm
-                :showSubmitButton="false"
-                :showResetButton="false"
-                @register="registerStep3CreateAlarm"
-              />
-              <BasicForm
-                :showSubmitButton="false"
-                :showResetButton="false"
-                @register="registerStep3RuleAlarm"
-              />
-              <BasicForm
-                :showSubmitButton="false"
-                :showResetButton="false"
-                @register="registerStep3Condition"
-              />
-              <BasicForm
-                :showSubmitButton="false"
-                :showResetButton="false"
-                @register="registerStep3Enable"
-              />
-              <BasicForm
-                :showSubmitButton="false"
-                :showResetButton="false"
-                @register="registerStep3TemplateDetail"
-              />
+            <div style="border-radius: 10px; border: 1px solid #f0f0f0">
+              <div style="margin-left: 15px">
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3Schemas"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3HighSetting"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3CreateAlarm"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3RuleAlarm"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3Condition"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3Enable"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3TemplateDetail"
+                />
+              </div>
             </div>
-            <div style="border-radius: 10px; border: 1px solid grey; margin-top: 15px">
+            <div style="border-radius: 10px; border: 1px solid #f0f0f0; margin-top: 15px">
               <p>清除报警规则</p>
-              <BasicForm
-                :showSubmitButton="false"
-                :showResetButton="false"
-                @register="registerStep3ClearRuleAlarm"
-              />
-              <BasicForm
-                :showSubmitButton="false"
-                :showResetButton="false"
-                @register="registerStep3ClearCondition"
-              />
-              <BasicForm
-                :showSubmitButton="false"
-                :showResetButton="false"
-                @register="registerStep3ClearEnable"
-              />
-              <BasicForm
-                :showSubmitButton="false"
-                :showResetButton="false"
-                @register="registerStep3ClearTemplateDetail"
-              />
+              <div style="margin-left: 15px">
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3ClearRuleAlarm"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3ClearCondition"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3ClearEnable"
+                />
+                <BasicForm
+                  :showSubmitButton="false"
+                  :showResetButton="false"
+                  @register="registerStep3ClearTemplateDetail"
+                />
+              </div>
             </div>
           </div>
         </TabPane>
@@ -93,7 +97,7 @@
 <script lang="ts">
   import { defineComponent, ref, computed, watch } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { Tabs, TabPane } from 'ant-design-vue';
+  import { Tabs } from 'ant-design-vue';
   import { deviceConfigGetDetail } from '/@/api/device/deviceConfigApi';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import {
@@ -116,14 +120,14 @@
 
   export default defineComponent({
     name: 'ConfigDrawer',
-    components: { Tabs, TabPane, BasicModal, BasicForm },
+    components: { Tabs, TabPane: Tabs.TabPane, BasicModal, BasicForm },
     emits: ['success', 'register'],
     setup() {
       const activeKey = ref('1');
       const isUpdate = ref(true);
       const descInfo: any = ref(null);
       const dataInfo: any = ref('');
-      const [registerDetail, { setFieldsValue: setRegisterDetail }] = useForm({
+      const [registerDetail, { resetFields, setFieldsValue: setRegisterDetail }] = useForm({
         schemas: step1Schemas,
         actionColOptions: {
           span: 24,
@@ -219,8 +223,10 @@
       const [register] = useModalInner(async (data) => {
         activeKey.value = '1';
         isUpdate.value = !!data?.isUpdate;
-        descInfo.value = await deviceConfigGetDetail(data.record.id);
+        const getV = await deviceConfigGetDetail(data.record.id);
+        descInfo.value = getV;
         try {
+          resetFields();
           await setRegisterDetail({ ...descInfo.value });
         } catch (e) {
           return e;
@@ -229,84 +235,90 @@
       const handleChange = (v) => {
         try {
           switch (v) {
-            case '1':
-              setRegisterDetail({ ...descInfo.value });
-              break;
+            // 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,
-                key1: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
-                  .condition[0].key.key,
-                type1:
-                  descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
-                    .condition[0].valueType,
-                value1:
-                  descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
-                    .condition[0].predicate.value.defaultValue,
-                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.type,
-              });
-              setRegisterStep3TemplateDetail({
-                alarmDetails:
-                  descInfo.value.profileData?.alarms[0].createRules[getKey[0]].alarmDetails,
-              });
-              //清楚报警
-              setRegisterStep3ClearRuleAlarm({
-                type: descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].key
-                  .type,
-                key1: descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].key
-                  .key,
-                type1:
-                  descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].valueType,
-                value1:
-                  descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].predicate
-                    .value.defaultValue,
-                operation:
-                  descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].predicate
-                    .operation,
-              });
-              setRegisterStep3ClearCondition({
-                conditionType: descInfo.value.profileData?.alarms[0].clearRule.condition.spec.type,
-              });
-              setRegisterStep3ClearEnable({
-                schedule: descInfo.value.profileData?.alarms[0].clearRule.schedule.type,
-              });
-              setRegisterStep3ClearTemplateDetail({
-                alarmDetails: descInfo.value.profileData?.alarms[0].clearRule.alarmDetails,
-              });
-              break;
+              setTimeout(() => {
+                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,
+                  key1: descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                    .condition[0].key.key,
+                  type1:
+                    descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                      .condition[0].valueType,
+                  value1:
+                    descInfo.value.profileData?.alarms[0].createRules[getKey[0]].condition
+                      .condition[0].predicate.value.defaultValue,
+                  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.type,
+                });
+                setRegisterStep3TemplateDetail({
+                  alarmDetails:
+                    descInfo.value.profileData?.alarms[0].createRules[getKey[0]].alarmDetails,
+                });
+                //清除报警
+                setRegisterStep3ClearRuleAlarm({
+                  type: descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].key
+                    .type,
+                  key1: descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].key
+                    .key,
+                  type1:
+                    descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0]
+                      .valueType,
+                  value1:
+                    descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].predicate
+                      .value.defaultValue,
+                  operation:
+                    descInfo.value.profileData?.alarms[0].clearRule.condition.condition[0].predicate
+                      .operation,
+                });
+                setRegisterStep3ClearCondition({
+                  conditionType:
+                    descInfo.value.profileData?.alarms[0].clearRule.condition.spec.type,
+                });
+                setRegisterStep3ClearEnable({
+                  schedule: descInfo.value.profileData?.alarms[0].clearRule.schedule.type,
+                });
+                setRegisterStep3ClearTemplateDetail({
+                  alarmDetails: descInfo.value.profileData?.alarms[0].clearRule.alarmDetails,
+                });
+              }, 1000);
             case '4':
-              setRegisterContact({
-                alarmContactId: descInfo.value.alarmProfile.alarmContactId,
-                messageMode: descInfo.value.alarmProfile.messageMode,
-              });
+              setTimeout(() => {
+                setRegisterContact({
+                  alarmContactId: descInfo.value?.alarmProfile?.alarmContactId,
+                  messageMode: descInfo.value?.alarmProfile?.messageMode,
+                });
+              }, 1000);
               break;
           }
         } catch (e) {

@@ -45,12 +45,12 @@
     </BasicTable>
     <DeviceProfileModal v-if="isJudgeStatus" @register="registerModal" @success="handleSuccess" />
     <DeviceConfigDetail @register="registerModalDetail" @success="handleSuccess" />
-    <ExpExcelModal @register="register1" @success="defaultHeader" />
+    <!-- <ExpExcelModal @register="register1" @success="defaultHeader" /> -->
   </div>
 </template>
 <script lang="ts">
   import { defineComponent, ref, reactive } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { BasicTable, useTable, TableAction, BasicColumn } from '/@/components/Table';
   import { columns, searchFormSchema } from './device.profile.data';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { deviceConfigGetQuery, deviceConfigDelete } from '/@/api/device/deviceConfigApi';
@@ -58,7 +58,7 @@
   import DeviceProfileModal from '/@/views/device/profile/DeviceProfileModal.vue';
   import DeviceConfigDetail from '/@/views/device/profile/deviceConfigDetail.vue';
   import { ImpExcel, ExcelData } from '/@/components/Excel';
-  import { jsonToSheetXlsx, ExportModalResult } from '/@/components/Excel';
+  // import { jsonToSheetXlsx, ExportModalResult } from '/@/components/Excel';
 
   export default defineComponent({
     name: 'DeviceProfileManagement',
@@ -156,23 +156,23 @@
         isJudgeStatus.value = false;
       }
 
-      function defaultHeader({ filename, bookType }: ExportModalResult) {
-        // 默认Object.keys(data[0])作为header
-        jsonToSheetXlsx({
-          data,
-          filename,
-          write2excelOpts: {
-            bookType,
-          },
-        });
-      }
+      // function defaultHeader({ filename, bookType }: ExportModalResult) {
+      //   // 默认Object.keys(data[0])作为header
+      //   jsonToSheetXlsx({
+      //     data,
+      //     filename,
+      //     write2excelOpts: {
+      //       bookType,
+      //     },
+      //   });
+      // }
 
-      const [register1, { openModal: openModalExcel }] = useModal();
+      // const [register1, { openModal: openModalExcel }] = useModal();
       const handleExport = (record: Recordable) => {
         console.log(record);
-        setTimeout(() => {
-          openModalExcel();
-        }, 50);
+        // setTimeout(() => {
+        //   openModalExcel();
+        // }, 50);
       };
       function handleImport() {
         console.log('record');
@@ -182,8 +182,8 @@
       }
       return {
         registerModalDetail,
-        register1,
-        defaultHeader,
+        // register1,
+        // defaultHeader,
         useSelectionChange,
         handleTableDel,
         isJudgeStatus,

 <template>
   <div class="step1">
     <div class="step1-form">
+      <div
+        style="
+          width: 12vw;
+          height: 24vh;
+          margin-left: 25px;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+        "
+      >
+        <div style="width: 4vw; height: 24vh">请上传图片</div>
+        <div style="width: 8vw; height: 24vh">
+          <Upload
+            style="width: 20vw"
+            name="avatar"
+            list-type="picture-card"
+            class="avatar-uploader"
+            :show-upload-list="false"
+            :customRequest="customUploadqrcodePic"
+            :before-upload="beforeUploadqrcodePic"
+          >
+            <img
+              style="text-align: center; border-radius: 50%; width: 10vw; height: 15vh"
+              v-if="peresonalPic"
+              :src="peresonalPic"
+              alt="avatar"
+            />
+            <div v-else>
+              <div style="margin-top: 30px">
+                <PlusOutlined style="font-size: 30px" />
+              </div>
+              <div
+                class="ant-upload-text flex"
+                style="width: 280px; height: 130px; align-items: center"
+              >
+                支持.PNG、.JPG、.JPEG格式，建议大小不超过2M。</div
+              >
+            </div>
+          </Upload>
+        </div>
+      </div>
       <BasicForm @register="register" />
     </div>
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
+  import { defineComponent, ref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { step1Schemas } from './data';
   import { Select, Input, Divider } from 'ant-design-vue';
+  import { uploadApi } from '/@/api/personal/index';
+  import { Upload } from 'ant-design-vue';
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import type { FileItem } from '/@/components/Upload/src/typing';
 
   export default defineComponent({
     components: {
@@ -18,9 +64,13 @@
       [Input.name]: Input,
       [Input.Group.name]: Input.Group,
       [Divider.name]: Divider,
+      Upload,
+      PlusOutlined,
     },
     emits: ['next', 'resetFunc'],
     setup(_, { emit }) {
+      const { createMessage } = useMessage();
+
       const [register, { validate, setFieldsValue, resetFields }] = useForm({
         labelWidth: 100,
         schemas: step1Schemas,
@@ -36,16 +86,59 @@
       const resetFieldsFunc = (v) => {
         setFieldsValue(v);
       };
+      const peresonalPic = ref();
+
+      const resetIconFunc = () => {
+        peresonalPic.value = '';
+      };
+
+      const editIconFunc = (v) => {
+        peresonalPic.value = v;
+      };
+
+      const customUploadqrcodePic = async ({ file }) => {
+        if (beforeUploadqrcodePic(file)) {
+          const formData = new FormData();
+          formData.append('file', file);
+          const response = await uploadApi(formData);
+          if (response.fileStaticUri) {
+            peresonalPic.value = response.fileStaticUri;
+          }
+        }
+      };
+
+      const beforeUploadqrcodePic = (file: FileItem) => {
+        const isJpgOrPng =
+          file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg';
+        if (!isJpgOrPng) {
+          createMessage.error('只能上传图片文件!');
+        }
+        const isLt2M = (file.size as number) / 1024 / 1024 < 2;
+        if (!isLt2M) {
+          createMessage.error('图片大小不能超过5MB!');
+        }
+        return isJpgOrPng && isLt2M;
+      };
       async function customSubmitFunc() {
         try {
           const values = await validate();
-          emit('next', values);
+          emit('next', values, peresonalPic.value);
         } catch (error) {}
       }
       const customResetFunc = async () => {
         await resetFields();
       };
-      return { register, resetFieldsFunc, customResetFunc };
+      return {
+        editIconFunc,
+        resetIconFunc,
+        register,
+        resetFieldsFunc,
+        customResetFunc,
+        uploadApi,
+        peresonalPic,
+        beforeUploadqrcodePic,
+        customUploadqrcodePic,
+      };
     },
   });
 </script>

@@ -31,7 +31,7 @@
         <template v-for="(childItem, createIndex) in item.alarms" :key="childItem.id">
           <div class="aic" style="border: 1px solid #bfbfbf">
             <div class="w-3/4">
-              <div style="margin-left: -30px; margin-top: 20px"
+              <div style="margin-left: -33px; margin-top: 20px"
                 ><BasicForm @register="registerFormCreateAlarm" />
               </div>
               <div style="margin-left: 5px; margin-top: -50px">
@@ -78,7 +78,7 @@
         <div style="height: 20px"></div>
         <p>清除报警规则</p>
         <template
-          v-for="(childClearItem, clearIndexItem) in item.alarms[clearIndex].clearRule"
+          v-for="(childClearItem, clearIndexItem) in item.clearRule"
           :key="childClearItem.id"
         >
           <div class="aic mb-1" style="border: 1px solid #bfbfbf">
@@ -222,12 +222,20 @@
       const ruleClearTemplateData: any = ref(null);
       const enableClearTemplateData: any = ref(null);
       const detailClearTemplateData: any = ref(null);
+      const scheduleCustomValue: any = ref({});
+      const scheduleCustomClearValue: any = ref({});
       const clearIndex = ref(-1);
+      const getSchduleCustomValue: any = ref([]);
+      const getSchduleClearCustomValue: any = ref([]);
       //告警列表
       let profileData = ref<IProfileData[]>([]);
       const log = (e) => {
         console.log(e);
       };
+      //编辑清空操作
+      const clearProfileDataFunc = () => {
+        unref(profileData).splice(0, 1);
+      };
       //删除告警配置
       const deleteAlarmRule = (index: number) => {
         unref(profileData).splice(index, 1);
@@ -254,26 +262,27 @@
               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: [''],
             },
           ],
+          clearRule: [
+            {
+              id: Date.now() + Math.random() + '',
+              alarmDetails: '',
+              dashboardId: {
+                id: '',
+                entityType: '',
+              },
+              propagate: '',
+              propagateRelationTypes: [''],
+              schedule: {
+                type: 'string',
+              },
+              condition: {},
+            },
+          ],
         });
       };
       //TODO Mobile dashboard:
@@ -342,6 +351,25 @@
       const resetRegisterFormCreateAlarmFunc = () => {
         resetRegisterFormCreateAlarm();
       };
+      const resetRulesFormDataFunc = () => {
+        ruleTemplateData.value = ``;
+      };
+      const resetEnableFormDataFunc = () => {
+        enableTemplateData.value = ``;
+      };
+      const resetTemplateFormDataFunc = () => {
+        detailTemplateData.value = ``;
+      };
+      const resetRulesClearFormDataFunc = () => {
+        ruleClearTemplateData.value = ``;
+      };
+      const resetEnableClearFormDataFunc = () => {
+        enableClearTemplateData.value = ``;
+      };
+      const resetTemplateClearFormDataFunc = () => {
+        detailClearTemplateData.value = ``;
+      };
+
       //回显表单数据
       const retryRegisterFormFunc = (v) => {
         setRegisterForm(v);
@@ -352,6 +380,25 @@
       const retryRegisterFormCreateAlarmFunc = (v) => {
         setRegisterFormCreateAlarm(v);
       };
+      const retryRulesFormDataFunc = (v) => {
+        ruleTemplateData.value = v;
+      };
+      const retryEnableFormDataFunc = (v) => {
+        enableTemplateData.value = v;
+      };
+      const retryTemplateFormDataFunc = (v) => {
+        detailTemplateData.value = v;
+      };
+      const retryRulesClearFormDataFunc = (v) => {
+        ruleClearTemplateData.value = v;
+      };
+      const retryEnableClearFormDataFunc = (v) => {
+        enableClearTemplateData.value = v;
+      };
+      const retryTemplateClearFormDataFunc = (v) => {
+        detailClearTemplateData.value = v;
+      };
+
       const tempValue1: string = ref<string>('');
       // 添加‘创建条件’
       const addCreateRole = (index: number) => {
@@ -400,27 +447,26 @@
             };
           },
         });
-
         unref(profileData)[index].alarms.push({
           id: Date.now() + Math.random() + '',
           alarmType: '',
           createRules: {},
-          clearRule: [
-            {
-              id: Date.now() + Math.random() + '',
-              alarmDetails: '',
-              dashboardId: {
-                id: '',
-                entityType: '',
-              },
-              propagate: '',
-              propagateRelationTypes: [''],
-              schedule: {
-                type: 'string',
-              },
-              condition: {},
-            },
-          ],
+          // clearRule: [
+          //   {
+          //     id: Date.now() + Math.random() + '',
+          //     alarmDetails: '',
+          //     dashboardId: {
+          //       id: '',
+          //       entityType: '',
+          //     },
+          //     propagate: '',
+          //     propagateRelationTypes: [''],
+          //     schedule: {
+          //       type: 'string',
+          //     },
+          //     condition: {},
+          //   },
+          // ],
           propagate: false,
           propagateRelationTypes: [''],
         });
@@ -486,12 +532,23 @@
             console.log(e);
           }
         });
+        const findDayCustomByValue = findDay.map((f, i) => {
+          try {
+            if (f.value == v.daysOfWeek1[i]) {
+              return f.label;
+            }
+          } catch (e) {
+            console.log(e);
+          }
+        });
         enableTemplateData.value =
-          v.startsOn == undefined
+          v.schedule == 'ANY_TIME'
             ? `始终启用`
-            : `
+            : v.schedule == 'SPECIFIC_TIME'
+            ? `
            开始时间:${v.startsOn},结束时间:${v.endsOn},天数:${findDayByValue}
-           `;
+           `
+            : `天数:${findDayCustomByValue},开始时间: ${v.startsOn1},结束时间:${v.endsOn1}`;
       };
       //规则条件
       const getAllFieldsRuleFunc = (v, v1) => {
@@ -516,7 +573,7 @@
           }
         });
         ruleTemplateData.value = `
-           键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
+           键名:${v.key1}  操作:${findRuleByValue?.label}  值:${v.value1}
            `;
 
         ruleLastObj.value = v1;
@@ -607,11 +664,23 @@
             console.log(e);
           }
         });
+        const findDayCustomByValue = findDay.map((f, i) => {
+          try {
+            if (f.value == v.daysOfWeek1[i]) {
+              return f.label;
+            }
+          } catch (e) {
+            console.log(e);
+          }
+        });
         enableClearTemplateData.value =
-          v.startsOn == undefined
+          v.schedule == 'ANY_TIME'
             ? `始终启用`
-            : `开始时间:${v.startsOn},结束时间:${v.endsOn},天数:${findDayByValue}
-           `;
+            : v.schedule == 'SPECIFIC_TIME'
+            ? `
+           开始时间:${v.startsOn},结束时间:${v.endsOn},天数:${findDayByValue}
+           `
+            : `天数:${findDayCustomByValue},开始时间: ${v.startsOn1},结束时间:${v.endsOn1}`;
       };
       //规则条件
       const getAllClearFieldsRuleFunc = (v, v1) => {
@@ -636,7 +705,7 @@
           }
         });
         ruleClearTemplateData.value = `
-           键名:${v.key1}...操作:${findRuleByValue?.label}...值:${v.value1}
+           键名:${v.key1}  操作:${findRuleByValue?.label}  值:${v.value1}
            `;
 
         ruleLastObj.value = v1;
@@ -677,7 +746,7 @@
         };
         Object.assign(addClearitionalObj.value, getValueConditon);
       };
-      //用于生成uuid
+      //生成uuid
       function generateUUID() {
         let d = new Date().getTime();
         if (window.performance && typeof window.performance.now === 'function') {
@@ -691,28 +760,111 @@
         return uuid;
       }
       const handleFormStep3toStep4Next = async () => {
+        console.log(enableObj.value);
         try {
+          if (enableObj.value.schedule == 'CUSTOM') {
+            for (let i in enableObj.value) {
+              console.log(enableObj.value[i]);
+              console.log(i);
+              // let o = {};
+              // if(enableObj.value[i]=='1')
+              // o[i] = enableObj.value[i];
+              // getSchduleCustomValue.value.push(o);
+              // getSchduleCustomValue.value.push(enableObj.value[i]);
+            }
+            console.log(getSchduleCustomValue.value);
+            // switch (enableObj.value.daysOfWeek1[0]) {
+            //   case '1':
+            //     getSchduleCustomValue.value.push({
+            //       enabled: true,
+            //       dayOfWeek: enableObj.value.daysOfWeek1[0],
+            //       startsOn: enableObj.value.startsOn1,
+            //       endsOn: enableObj.value.endsOn1,
+            //     });
+            //     break;
+            //   case '2':
+            //     getSchduleCustomValue.value.push({
+            //       enabled: true,
+            //       dayOfWeek: enableObj.value.daysOfWeek2[0],
+            //       startsOn: enableObj.value.startsOn2,
+            //       endsOn: enableObj.value.endsOn2,
+            //     });
+            //     break;
+            //   case '3':
+            //     getSchduleCustomValue.value.push({
+            //       enabled: true,
+            //       dayOfWeek: enableObj.value.daysOfWeek3[0],
+            //       startsOn: enableObj.value.startsOn3,
+            //       endsOn: enableObj.value.endsOn3,
+            //     });
+            //     break;
+            // }
+            scheduleCustomValue.value = {
+              type: enableObj.value.schedule,
+              timezone: enableObj.value.timezone,
+              items: getSchduleCustomValue.value,
+            };
+          }
+          //清除报警规则---报警日程表
+          if (enableClearObj.value.schedule == 'CUSTOM') {
+            switch (enableClearObj.value.daysOfWeek1[0]) {
+              case '1':
+                getSchduleClearCustomValue.value.push({
+                  enabled: true,
+                  dayOfWeek: enableClearObj.value.daysOfWeek1[0],
+                  startsOn: enableClearObj.value.startsOn1,
+                  endsOn: enableClearObj.value.endsOn1,
+                });
+                break;
+              case '2':
+                getSchduleClearCustomValue.value.push({
+                  enabled: true,
+                  dayOfWeek: enableClearObj.value.daysOfWeek2[0],
+                  startsOn: enableClearObj.value.startsOn2,
+                  endsOn: enableClearObj.value.endsOn2,
+                });
+                break;
+              case '3':
+                getSchduleClearCustomValue.value.push({
+                  enabled: true,
+                  dayOfWeek: enableClearObj.value.daysOfWeek3[0],
+                  startsOn: enableClearObj.value.startsOn3,
+                  endsOn: enableClearObj.value.endsOn3,
+                });
+                break;
+            }
+            scheduleCustomClearValue.value = {
+              type: enableClearObj.value.schedule,
+              timezone: enableClearObj.value.timezone,
+              items: getSchduleClearCustomValue.value,
+            };
+          }
           const scheduleClearValue = {
             type: enableClearObj.value.schedule,
             daysOfWeek: enableClearObj.value.daysOfWeek,
-            // endsOn: enableClearObj.value.endsOn,
-            // startsOn: enableClearObj.value.startOn,
+            endsOn: enableClearObj.value.endsOn,
+            startsOn: enableClearObj.value.startOn,
             timezone: enableClearObj.value.timezone,
           };
           const getClearSchedule = {
-            schedule: scheduleClearValue,
+            schedule:
+              enableClearObj.value.schedule == 'CUSTOM'
+                ? scheduleCustomClearValue.value
+                : scheduleClearValue,
           };
           const getClearAdditionalProp = Object.assign({}, detailClearObj.value, getClearSchedule);
           const scheduleValue = {
             type: enableObj.value.schedule,
             daysOfWeek: enableObj.value.daysOfWeek,
-            // endsOn: enableObj.value.endsOn,
-            // startsOn: enableObj.value.startOn,
+            endsOn: enableObj.value.endsOn,
+            startsOn: enableObj.value.startOn,
             timezone: enableObj.value.timezone,
           };
           const getSchedule = {
-            schedule: scheduleValue,
+            schedule:
+              enableObj.value.schedule == 'CUSTOM' ? scheduleCustomValue.value : scheduleValue,
           };
+
           const getAdditionalProp = Object.assign({}, detailObj.value, getSchedule);
           const getScheduleAndAlarmDetails = Object.assign(
             {},
@@ -746,7 +898,7 @@
           console.log(valueRegisterFormCreateAlarm);
           const getValueRegisterFormHighSetting = {
             propagate: valueRegisterFormHighSetting?.propagate,
-            propagateRelationTypes: [valueRegisterFormHighSetting?.propagateRelationTypes],
+            propagateRelationTypes: [valueRegisterFormHighSetting?.propagateRelationTypes].flat(1),
           };
           Object.assign(
             emptyObj.value,
@@ -756,7 +908,9 @@
             getClearRulesAllObj,
             objectId
           );
-          alarmss.value.push(emptyObj.value);
+          if (alarmss.value.length == 0) {
+            alarmss.value.push(emptyObj.value);
+          }
           const getAlarms = {
             alarms: alarmss.value,
           };
@@ -795,7 +949,11 @@
         isRuleAlarmRuleConditions.value = 4;
         setTimeout(() => {
           openModal4(true);
-          proxy.$refs.getChildData1.resetDataFunc();
+          try {
+            proxy.$refs.getChildData1.resetDataFunc();
+          } catch (e) {
+            return e;
+          }
         }, 50);
       };
       const handleOpenClearEnableRule = () => {
@@ -814,6 +972,19 @@
       };
 
       return {
+        resetEnableClearFormDataFunc,
+        resetTemplateClearFormDataFunc,
+        resetRulesClearFormDataFunc,
+        resetEnableFormDataFunc,
+        resetTemplateFormDataFunc,
+        resetRulesFormDataFunc,
+        retryEnableClearFormDataFunc,
+        retryTemplateClearFormDataFunc,
+        retryRulesClearFormDataFunc,
+        retryEnableFormDataFunc,
+        retryTemplateFormDataFunc,
+        retryRulesFormDataFunc,
+        clearProfileDataFunc,
         clearIndex,
         retryRegisterFormFunc,
         retryRegisterFormHighSettingmFunc,

@@ -99,7 +99,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'conditionType',
     label: '条件类型',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Select',
     componentProps: {
       placeholder: '请选择报警日程表',
@@ -177,11 +177,28 @@ export const formSchema: FormSchema[] = [
   {
     field: 'defaultValue',
     label: '持续时间值',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Input',
     componentProps: {
+      maxLength: 16,
       placeholder: '请输入持续时间值（请输入数字）',
     },
+    dynamicRules: () => {
+      return [
+        {
+          validator: (_, value) => {
+            if (!value) {
+              return Promise.reject('持续时间值不能为空');
+            }
+            const pwdRegex = new RegExp(/-?\d+/);
+            if (!pwdRegex.test(value)) {
+              return Promise.reject('只能为数字，且最长不超过16位');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
     ifShow: ({ values }) => isWenDu(Reflect.get(values, 'conditionType')),
     show: ({ values }) => {
       return !values.field5;
@@ -210,7 +227,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'unit',
     label: '时间单位',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Select',
     componentProps: {
       placeholder: '请选择时间单位',
@@ -226,12 +243,28 @@ export const formSchema: FormSchema[] = [
   {
     field: 'defaultValue',
     label: '事件计数值必填',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Input',
     componentProps: {
+      maxLength: 2147483637,
       placeholder: '请输入事件计数值（应在1到2147483637之间）',
     },
-    rules: [{ message: '事件计数应在1到2147483637之间', trigger: 'blur' }],
+    dynamicRules: () => {
+      return [
+        {
+          validator: (_, value) => {
+            if (!value) {
+              return Promise.reject('事件计数不能为空');
+            }
+            const pwdRegex = new RegExp(/-?\d+/);
+            if (!pwdRegex.test(value)) {
+              return Promise.reject('只能为数字，且最长不超过16位');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
     ifShow: ({ values }) => isTimeAll(Reflect.get(values, 'conditionType')),
     show: ({ values }) => {
       return !values.field6;
@@ -240,6 +273,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'inherit',
     label: '',
+    colProps: { span: 13 },
     component: 'Checkbox',
     renderComponentContent: 'Inherit from owner',
     ifShow: ({ values }) =>