Merge branch 'sqy_dev' into 'main'

Sqy dev远程分支与main合并

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

@@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = /
 
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
-VITE_PROXY = [["/api","http://localhost:8082/api"],["/upload","http://localhost:3300/upload"]]
+VITE_PROXY = [["/api","http://192.168.10.120:8082/api"],["/upload","http://192.168.10.120:3300/upload"]]
 # VITE_PROXY=[["/api","https://vvbin.cn/test"]]
 
 # Delete console

+{
+  "i18n-ally.localesPaths": [
+    "src/locales",
+    "src/locales/lang",
+    "public/resource/tinymce/langs"
+  ],
+  "commentTranslate.targetLanguage": "en"
+}

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

@@ -8,7 +8,6 @@
       name="viewport"
       content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
     />
-
     <title><%= title %></title>
     <link rel="icon" href="/favicon.ico" />
   </head>

@@ -21,7 +21,7 @@
     "clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite",
     "clean:lib": "rimraf node_modules",
     "lint:eslint": "eslint --cache --max-warnings 0  \"{src,mock}/**/*.{vue,ts,tsx}\" --fix",
-    "lint:prettier": "prettier --write  \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"",
+    "lint:prettier": "prettier --write  \"src/**/*.{js,json,ts,tsx,css,less,scss,vue,html,md}\"",
     "lint:stylelint": "stylelint --cache --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
     "lint:lint-staged": "lint-staged -c ./.husky/lintstagedrc.js",
     "lint:pretty": "pretty-quick --staged",
@@ -59,6 +59,7 @@
     "tinymce": "^5.8.2",
     "vditor": "^3.8.6",
     "vue": "3.2.2",
+    "vue-baidu-map": "^0.21.22",
     "vue-i18n": "9.1.7",
     "vue-json-pretty": "^2.0.4",
     "vue-router": "^4.0.11",

+import { defHttp } from '/@/utils/http/axios';
+import type {
+  ContactPageParams,
+  ContactModal,
+  ContactParams,
+  ContactInfo,
+} from './model/alarmContactModal';
+import { getPageData } from '../../base';
+enum Api {
+  alarmContact = '/alarmContact',
+  updateAlarmContact = '/alarmContact/update',
+}
+
+// 获取
+export const getAlarmContact = (params: ContactPageParams) => {
+  return getPageData<ContactModal>(params, Api.alarmContact);
+};
+
+// 新增
+export const addAlarmContact = (params: ContactParams) => {
+  return defHttp.post({
+    url: Api.alarmContact,
+    data: params,
+  });
+};
+
+// 更新
+export const updateAlarmContact = (params: ContactParams) => {
+  return defHttp.post({
+    url: Api.updateAlarmContact,
+    data: params,
+  });
+};
+
+// 删除
+export const deleteAlarmContact = (ids: string[]) => {
+  return defHttp.delete({
+    url: Api.alarmContact,
+    data: ids,
+  });
+};
+
+// 新增或者编辑
+export const saveOrEditAlarmContact = (params: ContactInfo, isUpdate: boolean) => {
+  if (isUpdate) return updateAlarmContact(params);
+  addAlarmContact(params);
+};

+import { BasicPageParams } from '/@/api/model/baseModel';
+
+interface ContactItemsModal {
+  id: string;
+  createTime: string;
+  enabled: boolean;
+  username: string;
+  department: string;
+  phone: string;
+}
+export type ContactPageParams = BasicPageParams & { username: string; organizationId: string };
+
+export interface ContactModal {
+  items: ContactItemsModal[];
+  total: number;
+}
+
+export interface ContactParams {
+  phone: string;
+  username: string;
+  department?: string;
+  email?: string;
+  wechat?: string;
+  addPeople?: string;
+  remark?: string;
+}
+
+export type ContactInfo = ContactParams;

-import {defHttp} from '/@/utils/http/axios';
+import { defHttp } from '/@/utils/http/axios';
 
 export interface PageData<T> {
   total: number;
@@ -14,7 +14,7 @@ export interface BaseQueryParams {
   pageSize: number;
   page: number;
   orderFiled?: string;
-  orderType?: OrderType
+  orderType?: OrderType;
 }
 
 export class BaseQueryRequest implements BaseQueryParams {
@@ -23,7 +23,7 @@ export class BaseQueryRequest implements BaseQueryParams {
   page: number;
   pageSize: number;
 
-  constructor(page: number = 1, pageSize: number = 10) {
+  constructor(page = 1, pageSize = 10) {
     this.page = page;
     this.pageSize = pageSize;
   }
@@ -41,16 +41,13 @@ export class BaseQueryRequest implements BaseQueryParams {
   }
 
   setPageSize(pageSize: number) {
-    this.pageSize = pageSize
+    this.pageSize = pageSize;
   }
-
 }
 
 export function getPageData<T>(params: BaseQueryParams, url: string): Promise<PageData<T>> {
-  return defHttp.get<PageData<T>>(
-    {
-      params: params,
-      url: url
-    }
-  );
+  return defHttp.get<PageData<T>>({
+    params: params,
+    url: url,
+  });
 }

-import {defHttp} from "/@/utils/http/axios";
+import { defHttp } from '/@/utils/http/axios';
 import {
   DeviceModel,
   DeviceProfileModel,
   DeviceProfileQueryParam,
-  DeviceQueryParam
-} from "/@/api/device/model/deviceModel";
+  DeviceQueryParam,
+} from '/@/api/device/model/deviceModel';
 
 enum DeviceManagerApi {
   /**
    * 设备URL
    */
-  DEVICE_URL = "/device",
+  DEVICE_URL = '/device',
   /**
    * 设备配置URL
    */
-  DEVICE_PROFILE_URL = "/deviceProfile"
+  DEVICE_PROFILE_URL = '/deviceProfile',
 }
 
-export const devicePage = (params: DeviceQueryParam) =>{
+export const devicePage = (params: DeviceQueryParam) => {
   return defHttp.get<DeviceModel>({
     url: DeviceManagerApi.DEVICE_URL,
-    params
+    params,
   });
-}
+};
 
 /**
  * 分页查询设备配置页面
@@ -31,9 +31,9 @@ export const devicePage = (params: DeviceQueryParam) =>{
 export const deviceProfilePage = (params: DeviceProfileQueryParam) => {
   return defHttp.get<DeviceProfileModel>({
     url: DeviceManagerApi.DEVICE_PROFILE_URL,
-    params
+    params,
   });
-}
+};
 /**
  * 删除设备配置
  * @param ids 删除的ids
@@ -41,11 +41,11 @@ export const deviceProfilePage = (params: DeviceProfileQueryParam) => {
 export const deleteDeviceProfile = (ids: string[]) => {
   return defHttp.delete({
     url: DeviceManagerApi.DEVICE_PROFILE_URL,
-    data:{
-      ids:ids
-    }
-  })
-}
+    data: {
+      ids: ids,
+    },
+  });
+};
 
 /**
  * 删除设备
@@ -54,8 +54,8 @@ export const deleteDeviceProfile = (ids: string[]) => {
 export const deleteDevice = (ids: string[]) => {
   return defHttp.delete({
     url: DeviceManagerApi.DEVICE_URL,
-    data:{
-      ids:ids
-    }
-  })
-}
+    data: {
+      ids: ids,
+    },
+  });
+};

-import {BasicPageParams} from "/@/api/model/baseModel";
+import { BasicPageParams } from '/@/api/model/baseModel';
 export enum DeviceState {
-  INACTIVE='INACTIVE',
-  ONLINE='ONLINE',
-  OFFLINE='OFFLINE'
+  INACTIVE = 'INACTIVE',
+  ONLINE = 'ONLINE',
+  OFFLINE = 'OFFLINE',
 }
-export enum DeviceTypeEnum{
-  GATEWAY='GATEWAY',
-  DIRECT_CONNECTION='DIRECT_CONNECTION',
-  SENSOR='SENSOR'
+export enum DeviceTypeEnum {
+  GATEWAY = 'GATEWAY',
+  DIRECT_CONNECTION = 'DIRECT_CONNECTION',
+  SENSOR = 'SENSOR',
 }
-export type DeviceProfileQueryParam = BasicPageParams & DeviceProfileParam
-export type DeviceQueryParam = BasicPageParams & DeviceParam
+export type DeviceProfileQueryParam = BasicPageParams & DeviceProfileParam;
+export type DeviceQueryParam = BasicPageParams & DeviceParam;
 export type DeviceParam = {
-  name?:string,
-  deviceProfileId?:string
-}
+  name?: string;
+  deviceProfileId?: string;
+};
 export type DeviceProfileParam = {
-  name?: string
-}
+  name?: string;
+};
 
-export interface DeviceModel{
-  id:string,
-  name:string,
-  deviceInfo:any,
-  activeTime:string,
-  deviceState:DeviceState,
-  profileId:string,
-  label:string,
-  lastConnectTime:string,
-  deviceType:DeviceTypeEnum
+export interface DeviceModel {
+  id: string;
+  name: string;
+  deviceInfo: any;
+  activeTime: string;
+  deviceState: DeviceState;
+  profileId: string;
+  label: string;
+  lastConnectTime: string;
+  deviceType: DeviceTypeEnum;
 }
 
-export interface DeviceProfileModel{
-  id:string,
-  name:string,
-  transportType:string,
-  createTime:string,
-  description:string
+export interface DeviceProfileModel {
+  id: string;
+  name: string;
+  transportType: string;
+  createTime: string;
+  description: string;
 }

 import { defHttp } from '/@/utils/http/axios';
 import {
   MessageConfig,
-  MessageConfigParams, MessageConfigResult,
+  MessageConfigParams,
+  MessageConfigResult,
   MessageConfigResultModel,
-  MessageParams
+  MessageParams,
 } from './model/configModel';
 
-
 enum MessageConfigApi {
   CONFIG_URL = '/message',
 }
@@ -14,13 +14,13 @@ enum MessageConfigApi {
 /**
  * 获取当前租户下的所有配置
  */
-export const findMessageConfig=(params: MessageParams)=>{
-  console.log(params,"params")
+export const findMessageConfig = (params: MessageParams) => {
+  console.log(params, 'params');
   return defHttp.post<MessageConfigResult>({
-    url: MessageConfigApi.CONFIG_URL + "/find",
+    url: MessageConfigApi.CONFIG_URL + '/find',
     params,
-  })
-}
+  });
+};
 
 /**
  * @description: 获取MessageConfig分页数据
@@ -41,14 +41,14 @@ export const saveOrEditMessageConfig = (params: MessageConfig, isUpdate: boolean
     return defHttp.put<MessageConfigResultModel>({
       url: MessageConfigApi.CONFIG_URL,
       params,
-    })
+    });
   } else {
     return defHttp.post<MessageConfigResultModel>({
       url: MessageConfigApi.CONFIG_URL,
       params,
-    })
+    });
   }
-}
+};
 
 /**
  * 更新配置状态
@@ -56,15 +56,15 @@ export const saveOrEditMessageConfig = (params: MessageConfig, isUpdate: boolean
  * @param messageType 消息类型
  * @param status 状态
  */
-export const setMessageConfigStatus=(id:string,messageType:string,status:number) =>
+export const setMessageConfigStatus = (id: string, messageType: string, status: number) =>
   defHttp.put<MessageConfigResultModel>({
     url: MessageConfigApi.CONFIG_URL,
-    data:{
-      "id":id,
-      "messageType":messageType,
-      "status":status,
+    data: {
+      id: id,
+      messageType: messageType,
+      status: status,
     },
-  })
+  });
 /**
  * 删除MessageConfig
  * @param ids 删除id数组
@@ -73,6 +73,6 @@ export const deleteMessageConfig = (ids: string[]) =>
   defHttp.delete({
     url: MessageConfigApi.CONFIG_URL,
     data: {
-      ids: ids
+      ids: ids,
     },
-  })
+  });

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

-import {BasicFetchResult, BasicPageParams} from "/@/api/model/baseModel";
+import { BasicFetchResult, BasicPageParams } from '/@/api/model/baseModel';
 
 export type MessageRecordsParams = BasicPageParams;
 
-export interface SmsLogModel{
-  id?:string
+export interface SmsLogModel {
+  id?: string;
 }
-export interface MailLogModel{
-  id?:string;
-  subject?:string;
-  to?:string;
-  cc?:string;
-  bcc?:string;
-  status?:number;
+export interface MailLogModel {
+  id?: string;
+  subject?: string;
+  to?: string;
+  cc?: string;
+  bcc?: string;
+  status?: number;
 }
-export type SmsLogModelResult= BasicFetchResult<SmsLogModel>;
-export type MailLogModelResult= BasicFetchResult<MailLogModel>;
+export type SmsLogModelResult = BasicFetchResult<SmsLogModel>;
+export type MailLogModelResult = BasicFetchResult<MailLogModel>;

-import {
-  BasicPageParams,
-  BasicFetchResult, BasicParams
-} from '/@/api/model/baseModel';
+import { BasicPageParams, BasicFetchResult, BasicParams } from '/@/api/model/baseModel';
 
 /**
  * @description: Request list interface parameters
@@ -15,23 +12,23 @@ export interface MessageTemplate {
 }
 
 export type SmsParams = {
-  id?:string;
-  phoneNumbers?:string;
-  params?:string;
-  remark?:string;
-  templatePurpose?:string;
-}
+  id?: string;
+  phoneNumbers?: string;
+  params?: string;
+  remark?: string;
+  templatePurpose?: string;
+};
 export type EmailParams = {
-  id?:string;
-  to?:string[];
-  cc?:string[];
-  bcc?:string[];
-  subject?:string;
-  emailFormatEnum?:string;
-  templatePurpose?:string;
-}
+  id?: string;
+  to?: string[];
+  cc?: string[];
+  bcc?: string[];
+  subject?: string;
+  emailFormatEnum?: string;
+  templatePurpose?: string;
+};
 export interface MessageResult {
-  result:boolean
+  result: boolean;
 }
 
 /**

-import {defHttp} from '/@/utils/http/axios';
+import { defHttp } from '/@/utils/http/axios';
 import {
   MailLogModelResult,
   MessageRecordsParams,
-  SmsLogModelResult
-} from "/@/api/message/model/recordsModel";
+  SmsLogModelResult,
+} from '/@/api/message/model/recordsModel';
 
 enum MessageRecordsApi {
-  SMS_RECORDS = "/smsLog",
-  EMAIL_RECORDS = "/mailLog"
+  SMS_RECORDS = '/smsLog',
+  EMAIL_RECORDS = '/mailLog',
 }
 
 /**
@@ -17,30 +17,30 @@ enum MessageRecordsApi {
 export const smsLogPage = (params: MessageRecordsParams) => {
   return defHttp.get<SmsLogModelResult>({
     url: MessageRecordsApi.SMS_RECORDS,
-    params
-  })
-}
+    params,
+  });
+};
 
 /**
  * 获取邮件发送记录【分页】
  * @param params 查询参数
  */
-export const mailLogPage=(params:MessageRecordsParams)=>{
+export const mailLogPage = (params: MessageRecordsParams) => {
   return defHttp.get<MailLogModelResult>({
     url: MessageRecordsApi.EMAIL_RECORDS,
-    params
-  })
-}
+    params,
+  });
+};
 
 /**
  * 删除邮件记录
  * @param ids 邮件记录ID
  */
-export const deleteMailLog =(ids: string[]) =>
+export const deleteMailLog = (ids: string[]) =>
   defHttp.delete({
     url: MessageRecordsApi.EMAIL_RECORDS,
     data: {
-      ids: ids
+      ids: ids,
     },
   });
 /**
@@ -51,6 +51,6 @@ export const deleteSmsLog = (ids: string[]) =>
   defHttp.delete({
     url: MessageRecordsApi.SMS_RECORDS,
     data: {
-      ids: ids
+      ids: ids,
     },
   });

 import { defHttp } from '/@/utils/http/axios';
 import {
-  EmailParams, MessageResultModel,
+  EmailParams,
+  MessageResultModel,
   MessageTemplate,
   MessageTemplateParams,
-  MessageTemplateResultModel, SmsParams
-} from "/@/api/message/model/templateModel";
-import {MessageConfigResultModel} from "/@/api/message/model/configModel";
+  MessageTemplateResultModel,
+  SmsParams,
+} from '/@/api/message/model/templateModel';
+import { MessageConfigResultModel } from '/@/api/message/model/configModel';
 
 enum MessageTemplateApi {
   TEMPLATE_URL = '/template',
@@ -15,19 +17,19 @@ enum MessageTemplateApi {
  * 短信发送
  * @param params 发送参数
  */
-export const sendSms=(params: SmsParams)=>{
+export const sendSms = (params: SmsParams) => {
   return defHttp.post<MessageResultModel>({
-    url: MessageTemplateApi.TEMPLATE_URL+"/sendSms",
+    url: MessageTemplateApi.TEMPLATE_URL + '/sendSms',
     params,
-  })
-}
+  });
+};
 
-export const sendEmail=(params:EmailParams)=>{
+export const sendEmail = (params: EmailParams) => {
   return defHttp.post<MessageResultModel>({
-    url: MessageTemplateApi.TEMPLATE_URL+"/sendEmail",
+    url: MessageTemplateApi.TEMPLATE_URL + '/sendEmail',
     params,
-  })
-}
+  });
+};
 
 export const messageTemplatePage = (params: MessageTemplateParams) =>
   defHttp.get<MessageTemplateResultModel>({
@@ -35,7 +37,6 @@ export const messageTemplatePage = (params: MessageTemplateParams) =>
     params,
   });
 
-
 /**
  * 更新或保存MessageTemplate配置
  * @param params 参数
@@ -46,14 +47,14 @@ export const saveOrEditMessageTemplate = (params: MessageTemplate, isUpdate: boo
     return defHttp.put<MessageTemplateResultModel>({
       url: MessageTemplateApi.TEMPLATE_URL,
       params,
-    })
+    });
   } else {
     return defHttp.post<MessageTemplateResultModel>({
       url: MessageTemplateApi.TEMPLATE_URL,
       params,
-    })
+    });
   }
-}
+};
 
 /**
  * 删除MessageConfig
@@ -63,21 +64,26 @@ export const deleteMessageTemplate = (ids: string[]) =>
   defHttp.delete({
     url: MessageTemplateApi.TEMPLATE_URL,
     data: {
-      ids: ids
+      ids: ids,
     },
-  })
+  });
 /**
  * 更新模板状态
  * @param id 配置id
  * @param status 状态
  */
-export const setMessageTemplateStatus=(id:string,templatePurpose:string,messageType:string,status:number) =>
+export const setMessageTemplateStatus = (
+  id: string,
+  templatePurpose: string,
+  messageType: string,
+  status: number
+) =>
   defHttp.put<MessageConfigResultModel>({
     url: MessageTemplateApi.TEMPLATE_URL,
-    data:{
-      "id":id,
-      "status":status,
-      "templatePurpose":templatePurpose,
-      "messageType":messageType
+    data: {
+      id: id,
+      status: status,
+      templatePurpose: templatePurpose,
+      messageType: messageType,
     },
-  })
+  });

@@ -3,10 +3,10 @@ export interface BasicPageParams {
   pageSize: number;
 }
 
-export interface BasicParams<T extends any>{
-  code:number;
-  message:string;
-  data:T;
+export interface BasicParams<T extends any> {
+  code: number;
+  message: string;
+  data: T;
 }
 
 export interface BasicFetchResult<T extends any> {

-import {defHttp} from "/@/utils/http/axios";
-import {FileUploadResponse} from "/@/api/oss/FileUploadResponse";
+import { defHttp } from '/@/utils/http/axios';
+import { FileUploadResponse } from '/@/api/oss/FileUploadResponse';
 
 enum Api {
   BaseUploadUrl = '/oss/upload',
 }
 
 export const upload = (file) => {
-  return defHttp.post<FileUploadResponse>({url: Api.BaseUploadUrl, params: file})
-}
+  return defHttp.post<FileUploadResponse>({ url: Api.BaseUploadUrl, params: file });
+};

 export interface JwtModel {
-    userId: string;
-    username: string;
-    tenantCode: string;
-    tenantName: string;
-    exp: number;
-    role: string[];
-  }
--  
\ No newline at end of file
+  userId: string;
+  username: string;
+  tenantCode: string;
+  tenantName: string;
+  exp: number;
+  role: string[];
+}

-import {defHttp} from '/@/utils/http/axios';
-import {getMenuListResultModel} from './model/menuModel';
-import {useUserStore} from '/@/store/modules/user';
-import {RoleEnum} from '/@/enums/roleEnum';
+import { defHttp } from '/@/utils/http/axios';
+import { getMenuListResultModel } from './model/menuModel';
+import { useUserStore } from '/@/store/modules/user';
+import { RoleEnum } from '/@/enums/roleEnum';
 
 enum Api {
   BaseMenuUrl = '/menu',
   GetMenuList = '/menu/me/menus',
   SysAdminMenuList = '/admin/me/menus',
-  GetMenuIdsByRoleId = '/menu/getMenuIdsByRoleId/'
+  GetMenuIdsByRoleId = '/menu/getMenuIdsByRoleId/',
 }
 
 /**
@@ -17,17 +17,17 @@ 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.ROLE_SYS_ADMIN)) {
     url = Api.SysAdminMenuList;
   }
-  return defHttp.get<getMenuListResultModel>({url: url});
+  return defHttp.get<getMenuListResultModel>({ url: url });
 };
 
 export const delMenu = (menuIds: string[]) => {
-  let url = Api.BaseMenuUrl;
-  return defHttp.delete({url: url, data: menuIds})
-}
+  const url = Api.BaseMenuUrl;
+  return defHttp.delete({ url: url, data: menuIds });
+};
 export const getMenusIdsByRoleId = (roleId: string) => {
-  let url = Api.GetMenuIdsByRoleId + roleId;
-  return defHttp.get<Array<string>>({url: url});
-}
+  const url = Api.GetMenuIdsByRoleId + roleId;
+  return defHttp.get<Array<string>>({ url: url });
+};

@@ -9,9 +9,9 @@ export interface RouteItem {
   redirect?: string;
   caseSensitive?: boolean;
   children?: RouteItem[];
-  menuName?:string;
-  icon?:string;
-  key?:string;
+  menuName?: string;
+  icon?: string;
+  key?: string;
 }
 
 /**

@@ -42,8 +42,7 @@ export interface GetUserInfoModel {
   // 介绍
   desc?: string;
 }
- export interface UserInfoModel{
-
+export interface UserInfoModel {
   userId: string | number;
   username: string;
   realName: string;
@@ -52,10 +51,9 @@ export interface GetUserInfoModel {
   tenantName: string;
   roles: string[];
   plainRoles?: PlainRoleInfo[];
- }
+}
 
- export interface PlainRoleInfo {
+export interface PlainRoleInfo {
   roleName: string;
   roleId: string;
 }
-

@@ -5,7 +5,7 @@ import {
   GetUserInfoModel,
   UserInfoModel,
   RefreshTokenParams,
-  SmsLoginParams
+  SmsLoginParams,
 } from './model/userModel';
 
 import { ErrorMessageMode } from '/#/axios';
@@ -18,7 +18,7 @@ enum Api {
   GetMyInfo = '/user/me/info',
   GetPermCode = '/role/me/permissions',
   RefreshToken = '/auth/token',
-  SendLoginSmsCode = '/noauth/sendLoginSmsCode/'
+  SendLoginSmsCode = '/noauth/sendLoginSmsCode/',
 }
 
 /**
@@ -35,7 +35,7 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal')
     }
   );
 }
-export function getMyInfo(){
+export function getMyInfo() {
   return defHttp.get<UserInfoModel>({ url: Api.GetMyInfo });
 }
 /**
@@ -48,19 +48,17 @@ export function getUserInfo() {
 export function getPermCode() {
   return defHttp.get<string[]>({ url: Api.GetPermCode });
 }
-export async function  SendLoginSmsCode(phoneNumber:string){
- return await defHttp.post<boolean>({url:Api.SendLoginSmsCode+phoneNumber})
+export async function SendLoginSmsCode(phoneNumber: string) {
+  return await defHttp.post<boolean>({ url: Api.SendLoginSmsCode + phoneNumber });
 }
 export function doLogout() {
   // return defHttp.get({ url: Api.Logout });
 }
-export function doRefreshToken(params:RefreshTokenParams){
-  return defHttp.post<LoginResultModel>(
-    {
-      url: Api.RefreshToken,
-      params,
-    }
-  );
+export function doRefreshToken(params: RefreshTokenParams) {
+  return defHttp.post<LoginResultModel>({
+    url: Api.RefreshToken,
+    params,
+  });
 }
 export function smsCodeLoginApi(params: SmsLoginParams, mode: ErrorMessageMode = 'modal') {
   return defHttp.post<LoginResultModel>(

-import {defHttp} from '/@/utils/http/axios';
+import { defHttp } from '/@/utils/http/axios';
 
-import {DeptListGetResultModel, DeptListItem} from "/@/api/system/model/deptModel";
-
-import {DeptOperationApiResult, DeptOperationParams} from "/@/api/system/model/deptModel";
-import {ErrorMessageMode} from "/#/axios";
+import { DeptListGetResultModel, DeptListItem } from '/@/api/system/model/deptModel';
 
+import { DeptOperationApiResult, DeptOperationParams } from '/@/api/system/model/deptModel';
+import { ErrorMessageMode } from '/#/axios';
 
 enum Api {
   DeptList = '/dept/all',
@@ -17,7 +16,11 @@ export const getDeptList = (params?: DeptListItem) =>
 /**
  * @description: save or edit dept api
  */
-export function saveOrEditDeptApi(params: DeptOperationParams, update: boolean = false, mode: ErrorMessageMode = 'modal') {
+export function saveOrEditDeptApi(
+  params: DeptOperationParams,
+  update = false,
+  mode: ErrorMessageMode = 'modal'
+) {
   if (!update) {
     return defHttp.post<DeptOperationApiResult>(
       {
@@ -29,11 +32,14 @@ export function saveOrEditDeptApi(params: DeptOperationParams, update: boolean =
       }
     );
   } else {
-    return defHttp.put<DeptOperationApiResult>({url: Api.basicUrl, params}, {errorMessageMode: mode});
+    return defHttp.put<DeptOperationApiResult>(
+      { url: Api.basicUrl, params },
+      { errorMessageMode: mode }
+    );
   }
 }
 
 export const delDept = (menuIds: string[]) => {
-  let url = Api.basicUrl;
-  return defHttp.delete({url: url, data: menuIds})
-}
+  const url = Api.basicUrl;
+  return defHttp.delete({ url: url, data: menuIds });
+};

-import {defHttp} from '/@/utils/http/axios';
+import { defHttp } from '/@/utils/http/axios';
 import {
   SysDictItem,
   SysDict,
   SysDictParams,
   SysDictItemParams,
   SysDictResultModel,
-  SysDictItemResultModel, SysDictItemResult, DictCodeParams
+  SysDictItemResultModel,
+  SysDictItemResult,
+  DictCodeParams,
 } from './model/dictModel';
 
-
 enum SysDictApi {
   CONFIG_URL = '/dict',
-  CONFIG_ITEM_URL = '/dictItem'
+  CONFIG_ITEM_URL = '/dictItem',
 }
 
 /**
  * 查找字典值
  * @param code
  */
-export const findDictItemByCode=(params? : DictCodeParams)=>
-{
+export const findDictItemByCode = (params?: DictCodeParams) => {
   return defHttp.post<SysDictItemResult>({
-    url: SysDictApi.CONFIG_ITEM_URL + "/find",
+    url: SysDictApi.CONFIG_ITEM_URL + '/find',
     params,
-  })
+  });
 };
 
 /**
@@ -56,14 +56,14 @@ export const saveOrEditDictItem = (params: SysDictItem, isUpdate: boolean) => {
     return defHttp.put<SysDictItemResultModel>({
       url: SysDictApi.CONFIG_ITEM_URL,
       params,
-    })
+    });
   } else {
     return defHttp.post<SysDictItemResultModel>({
       url: SysDictApi.CONFIG_ITEM_URL,
       params,
-    })
+    });
   }
-}
+};
 
 /**
  * 修改DictItem的状态
@@ -74,11 +74,11 @@ export const setDictItemStatus = (id: string, status: number) => {
   return defHttp.put<SysDictItemResultModel>({
     url: SysDictApi.CONFIG_ITEM_URL,
     data: {
-      "id": id,
-      "status": status
+      id: id,
+      status: status,
     },
-  })
-}
+  });
+};
 
 /**
  * 保存或更新字典表
@@ -90,29 +90,32 @@ export const saveOrEditDict = (params: SysDict, isUpdate: boolean) => {
     return defHttp.put<SysDictResultModel>({
       url: SysDictApi.CONFIG_URL,
       params,
-    })
+    });
   } else {
     return defHttp.post<SysDictResultModel>({
       url: SysDictApi.CONFIG_URL,
       params,
-    })
+    });
   }
-}
+};
 
 /**
  * 删除SysDict
  * @param ids 删除id数组
  */
 export const deleteDict = (ids: string[]) =>
-  defHttp.delete({
-    url: SysDictApi.CONFIG_URL,
-    data: {
-      ids: ids
+  defHttp.delete(
+    {
+      url: SysDictApi.CONFIG_URL,
+      data: {
+        ids: ids,
+      },
     },
-  }, {
-    errorMessageMode: "message",
-    // catchFirst:true
-  })
+    {
+      errorMessageMode: 'message',
+      // catchFirst:true
+    }
+  );
 /**
  * 删除SysDictItem
  * @param ids 删除id数组
@@ -121,7 +124,6 @@ export const deleteDictItem = (ids: string[]) =>
   defHttp.delete({
     url: SysDictApi.CONFIG_ITEM_URL,
     data: {
-      ids: ids
+      ids: ids,
     },
-  })
-
+  });

-import {defHttp} from "/@/utils/http/axios";
-import {GroupListResultModel} from "/@/api/system/model/groupModel";
+import { defHttp } from '/@/utils/http/axios';
+import { GroupListResultModel } from '/@/api/system/model/groupModel';
 
 enum GroupApi {
-  BASE_URL="/organization"
+  BASE_URL = '/organization',
 }
 
 /**
  * 查询当前用户的所属组织
  */
-export const findCurrentUserGroups=()=>
+export const findCurrentUserGroups = () =>
   defHttp.get<GroupListResultModel>({
-    url: GroupApi.BASE_URL+"/me/organizations",
+    url: GroupApi.BASE_URL + '/me/organizations',
   });

-import {MenuOperationParams, MenuOperationApiResult} from "/@/api/system/model/menuModel";
-import {ErrorMessageMode} from "/#/axios";
-import {defHttp} from "/@/utils/http/axios";
-
+import { MenuOperationParams, MenuOperationApiResult } from '/@/api/system/model/menuModel';
+import { ErrorMessageMode } from '/#/axios';
+import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
   Save = '/menu',
@@ -10,7 +9,11 @@ enum Api {
 /**
  * @description: save menu api
  */
-export function saveMenuApi(params: MenuOperationParams, update: boolean = false, mode: ErrorMessageMode = 'modal') {
+export function saveMenuApi(
+  params: MenuOperationParams,
+  update: boolean = false,
+  mode: ErrorMessageMode = 'modal'
+) {
   console.log(params);
   if (!update) {
     return defHttp.post<MenuOperationApiResult>(
@@ -23,6 +26,9 @@ export function saveMenuApi(params: MenuOperationParams, update: boolean = false
       }
     );
   } else {
-    return defHttp.put<MenuOperationApiResult>({url: Api.Save, params}, {errorMessageMode: mode});
+    return defHttp.put<MenuOperationApiResult>(
+      { url: Api.Save, params },
+      { errorMessageMode: mode }
+    );
   }
 }

-import {BasicFetchResult} from "/@/api/model/baseModel";
+import { BasicFetchResult } from '/@/api/model/baseModel';
 
 export interface DeptOperationParams {
   id: string;
@@ -6,18 +6,16 @@ export interface DeptOperationParams {
   createTime: string;
   tenantCode: string;
   parentId?: string;
-  orderNo:number;
-  status:number;
+  orderNo: number;
+  status: number;
   remark: string;
 }
 
-
 export interface DeptOperationApiResult {
   message: string;
   code: number;
 }
 
-
 export interface DeptListItem {
   id: string;
   deptName: string;

-import {
-  BasicPageParams,
-  BasicFetchResult
-} from '/@/api/model/baseModel';
+import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
 /**
  * @description: Request list interface parameters
  */
 export type SysDictParams = BasicPageParams & DictParams;
-export type SysDictItemParams =  BasicPageParams & DictItemParams;
+export type SysDictItemParams = BasicPageParams & DictItemParams;
 
-export type DictCodeParams={
-  dictCode?:string;
-}
+export type DictCodeParams = {
+  dictCode?: string;
+};
 
 export type DictParams = {
-  dictName?:string;
-  dictCode?:string;
-}
+  dictName?: string;
+  dictCode?: string;
+};
 
 export interface SysDict {
   id: string;
@@ -28,17 +25,17 @@ export interface SysDict {
 }
 
 export type DictItemParams = {
-  itemText?:string;
-  dictId?:string;
-}
+  itemText?: string;
+  dictId?: string;
+};
 
-export interface SysDictItem{
+export interface SysDictItem {
   id: string;
-  itemText:string;
-  itemValue:string;
-  description:string;
-  sort:number;
-  status:number;
+  itemText: string;
+  itemValue: string;
+  description: string;
+  sort: number;
+  status: number;
   createTime: string;
   updateTime: string;
 }
@@ -51,4 +48,3 @@ export type SysDictResultModel = BasicFetchResult<SysDict>;
 export type SysDictItemResultModel = BasicFetchResult<SysDictItem>;
 
 export type SysDictItemResult = SysDictItem;
-

-
-export interface GroupItem{
-  id:string;
-  name:string;
-  parentId:string;
-  sort:number;
-  children?:GroupItem[];
+export interface GroupItem {
+  id: string;
+  name: string;
+  parentId: string;
+  sort: number;
+  children?: GroupItem[];
 }
 
 export type GroupListResultModel = GroupItem[];

-
 export interface MenuOperationApiResult {
   message: string;
   code: number;
 }
 
-
 export interface MenuOperationParams {
   path: string;
   component: any;
-  type:string;
-  parentId:string;
+  type: string;
+  parentId: string;
   meta: metaModel;
   name?: string;
   alias?: string | string[];
@@ -21,8 +19,8 @@ export interface MenuOperationParams {
 export interface metaModel {
   icon: string;
   title: string;
-  isLink:boolean;
-  menuType:number;
+  isLink: boolean;
+  menuType: number;
   ignoreKeepAlive?: boolean;
   hideMenu: boolean;
   status: number;

-import {BasicPageParams, BasicFetchResult} from '/@/api/model/baseModel';
+import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
 
 export type AccountParams = BasicPageParams & {
   account?: string;
@@ -6,7 +6,7 @@ export type AccountParams = BasicPageParams & {
 };
 
 export type RoleParams = {
-  roleType?:string;
+  roleType?: string;
   roleName?: string;
   status?: string;
 };
@@ -30,10 +30,10 @@ export interface AccountListItem {
   email: string;
   realName: string;
   roles: any;
-  groupIds:any;
+  groupIds: any;
   createTime: string;
   deptId: string;
-  accountExpireTime?:string;
+  accountExpireTime?: string;
 }
 
 export interface OrganizationListItem {
@@ -69,16 +69,16 @@ export interface RoleReqDTO {
 }
 
 export interface ChangeAccountParams {
-  userId?:string;
-  password?:string;
-  resetPassword?:string;
+  userId?: string;
+  password?: string;
+  resetPassword?: string;
 }
 
 export class RoleOrOrganizationParam {
-  userId:string;
-  queryRole:boolean;
-  queryOrganization:boolean;
-  constructor(userId:string,queryRole:boolean,queryOrganization:boolean){
+  userId: string;
+  queryRole: boolean;
+  queryOrganization: boolean;
+  constructor(userId: string, queryRole: boolean, queryOrganization: boolean) {
     this.queryRole = queryRole;
     this.queryOrganization = queryOrganization;
     this.userId = userId;
@@ -99,4 +99,3 @@ export type RolePageListGetResultModel = BasicFetchResult<RoleListItem>;
 export type RoleListGetResultModel = RoleListItem[];
 
 export type AccountListModel = AccountListItem;
-

@@ -15,7 +15,7 @@ import {
   RoleOrOrganizationParam,
   ChangeAccountParams,
 } from './model/systemModel';
-import {defHttp} from '/@/utils/http/axios';
+import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
   AccountList = '/user/page',
@@ -28,33 +28,34 @@ enum Api {
   DeleteRole = '/role',
   GetAllRoleList = '/role/find/list',
   BaseUserUrl = '/user',
-  BaseOrganization = '/organization'
+  BaseOrganization = '/organization',
 }
 
-export const getAccountInfo=(userId:string)=>
-  defHttp.get<AccountListModel>({url: Api.BaseUserUrl+"/"+userId})
+export const getAccountInfo = (userId: string) =>
+  defHttp.get<AccountListModel>({ url: Api.BaseUserUrl + '/' + userId });
 
 export const getAccountList = (params: AccountParams) =>
-  defHttp.get<AccountListGetResultModel>({url: Api.AccountList, params});
-
+  defHttp.get<AccountListGetResultModel>({ url: Api.AccountList, params });
 /**
  * 获取组织列表
  * @param params 请求参数
  */
 export const getOrganizationList = (params?: OrganizationListItem) =>
-  defHttp.get<OrganizationListGetResultModel>({url: Api.BaseOrganization+'/me/organizations', params});
+  defHttp.get<OrganizationListGetResultModel>({
+    url: Api.BaseOrganization + '/me/organizations',
+    params,
+  });
 
 /**
  * 更新或者保存组织
  * @param params
  * @param isUpdate
  */
-export const saveOrUpdateOrganization = (params?:OrganizationListItem,isUpdate?:boolean) =>
-{
-  if(isUpdate){
-    return defHttp.put<OrganizationListGetResultModel>({url: Api.BaseOrganization, params});
-  }else{
-    return defHttp.post<OrganizationListGetResultModel>({url: Api.BaseOrganization, params});
+export const saveOrUpdateOrganization = (params?: OrganizationListItem, isUpdate?: boolean) => {
+  if (isUpdate) {
+    return defHttp.put<OrganizationListGetResultModel>({ url: Api.BaseOrganization, params });
+  } else {
+    return defHttp.post<OrganizationListGetResultModel>({ url: Api.BaseOrganization, params });
   }
 };
 
@@ -63,32 +64,31 @@ export const saveOrUpdateOrganization = (params?:OrganizationListItem,isUpdate?:
  * @param ids 删除的ID
  */
 export const delOrganization = (ids: string[]) =>
-  defHttp.delete({url: Api.BaseOrganization, data: ids})
-
+  defHttp.delete({ url: Api.BaseOrganization, data: ids });
 
 export const getMenuList = (params?: MenuParams) =>
-  defHttp.get<MenuListGetResultModel>({url: Api.MenuList, params});
+  defHttp.get<MenuListGetResultModel>({ url: Api.MenuList, params });
 
 export const getRoleListByPage = (params?: RolePageParams) =>
-  defHttp.get<RolePageListGetResultModel>({url: Api.RolePageList, params});
-export const getTenantRoleListByPage= (params?: RolePageParams) =>
-  defHttp.get<RolePageListGetResultModel>({url: Api.RolePageList, params});
+  defHttp.get<RolePageListGetResultModel>({ url: Api.RolePageList, params });
+export const getTenantRoleListByPage = (params?: RolePageParams) =>
+  defHttp.get<RolePageListGetResultModel>({ url: Api.RolePageList, params });
 
 export const getAllRoleList = (params?: RoleParams) =>
-  defHttp.post<RoleListGetResultModel>({url: Api.GetAllRoleList, params});
+  defHttp.post<RoleListGetResultModel>({ url: Api.GetAllRoleList, params });
 
 export const setRoleStatus = (id: number, status: number) =>
-  defHttp.put({url: Api.setRoleStatus + id + "/" + status});
+  defHttp.put({ url: Api.setRoleStatus + id + '/' + status });
 export const saveOrUpdateRoleInfoWithMenu = async (roleRequestDto: RoleReqDTO) => {
-  await defHttp.post({url: Api.SaveOrUpdateRoleInfoWithMenu, params: roleRequestDto});
-}
+  await defHttp.post({ url: Api.SaveOrUpdateRoleInfoWithMenu, params: roleRequestDto });
+};
 
 export const isAccountExist = (account: string) =>
-  defHttp.get({url: Api.IsAccountExist + account}, {errorMessageMode: 'none'});
+  defHttp.get({ url: Api.IsAccountExist + account }, { errorMessageMode: 'none' });
 
 export const delRole = async (roleIds: string[]) => {
-  await defHttp.delete({url: Api.DeleteRole, params: roleIds});
-}
+  await defHttp.delete({ url: Api.DeleteRole, params: roleIds });
+};
 
 /**
  * 更新或添加用户信息
@@ -96,19 +96,19 @@ export const delRole = async (roleIds: string[]) => {
  * @param isUpdate
  * @constructor
  */
-export const SaveOrUpdateUserInfo = (params: AccountListItem, isUpdate: boolean)=>{
+export const SaveOrUpdateUserInfo = (params: AccountListItem, isUpdate: boolean) => {
   if (isUpdate) {
     return defHttp.put<AccountListModel>({
       url: Api.BaseUserUrl,
       params,
-    })
+    });
   } else {
     return defHttp.post<AccountListModel>({
       url: Api.BaseUserUrl,
       params,
-    })
+    });
   }
-}
+};
 /**
  * 删除User
  * @param ids 删除id数组
@@ -117,26 +117,27 @@ export const deleteUser = (ids: string[]) =>
   defHttp.delete({
     url: Api.BaseUserUrl,
     data: {
-      ids: ids
+      ids: ids,
     },
-  })
+  });
 
 /**
  * 查询当前用户的关系
  * @param params
  */
-export const findCurrentUserRelation=(params:RoleOrOrganizationParam)=>
+
+export const findCurrentUserRelation = (params: RoleOrOrganizationParam) =>
   defHttp.post<Array<string>>({
-    url: Api.BaseUserUrl+"/relation",
-    params:params
+    url: Api.BaseUserUrl + '/relation',
+    params: params,
   });
 
 /**
  * 修改密码
  * @param params
  */
-export const resetPassword=(params:ChangeAccountParams)=>
+export const resetPassword = (params: ChangeAccountParams) =>
   defHttp.post({
-    url: Api.BaseUserUrl + "/reset",
-    params:params
+    url: Api.BaseUserUrl + '/reset',
+    params: params,
   });

-import {getPageData} from '../base';
+import { getPageData } from '../base';
 import {
   SendResetPasswordEmailMsg,
   TenantAdminPageRequestParams,
   TenantDTO,
   TenantPageRequestParams,
-  TenantRequestDTO, UserDTO
+  TenantRequestDTO,
+  UserDTO,
 } from './tenantInfo';
-import {defHttp} from "/@/utils/http/axios";
+import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
   userPage = '/user/page',
   tenantPage = '/admin/tenant/page',
   saveTenantAdmin = '/user/saveTenantAdmin',
-  updateOrCreateTenant = "/admin/tenant/updateOrCreateTenant",
-  deleteTenant = "/admin/tenant",
-  resetTenantAdminPassword = "/tenant/resetPassword/",
-  sendMessageOrEmail = "/tenant/sendRestPasswordMsg",
+  updateOrCreateTenant = '/admin/tenant/updateOrCreateTenant',
+  deleteTenant = '/admin/tenant',
+  resetTenantAdminPassword = '/tenant/resetPassword/',
+  sendMessageOrEmail = '/tenant/sendRestPasswordMsg',
   deleteTenantAdmin = '/admin/user/deleteTenantAdmin',
-  getTenantRoles="/admin/tenant/roles/",
+  getTenantRoles = '/admin/tenant/roles/',
 }
 
 export function getTenantPage(params: TenantPageRequestParams) {
@@ -29,63 +30,49 @@ export function getTenantAdminPage(params: TenantAdminPageRequestParams) {
 }
 
 export async function saveTenantAdmin(params: UserDTO) {
-  await defHttp.post(
-    {
-      params: params,
-      url: Api.saveTenantAdmin
-    }
-  );
+  await defHttp.post({
+    params: params,
+    url: Api.saveTenantAdmin,
+  });
 }
 
 export async function updateOrCreateTenant(params: TenantRequestDTO) {
-  await defHttp.post(
-    {
-      params: params,
-      url: Api.updateOrCreateTenant
-    }
-  );
+  await defHttp.post({
+    params: params,
+    url: Api.updateOrCreateTenant,
+  });
 }
 
 export async function deleteTenant(tenantIds: Array<string>) {
-  await defHttp.delete(
-    {
-      data: tenantIds,
-      url: Api.deleteTenant
-    }
-  );
+  await defHttp.delete({
+    data: tenantIds,
+    url: Api.deleteTenant,
+  });
 }
 
 export async function deleteTenantAdmin(adminIds: Array<string>) {
-  await defHttp.delete(
-    {
-      data: adminIds,
-      url: Api.deleteTenantAdmin
-    }
-  );
+  await defHttp.delete({
+    data: adminIds,
+    url: Api.deleteTenantAdmin,
+  });
 }
 
 export async function resetPassword(params: string) {
-  await defHttp.post(
-    {
-      url: Api.resetTenantAdminPassword + params
-    }
-  );
+  await defHttp.post({
+    url: Api.resetTenantAdminPassword + params,
+  });
 }
 
 export async function sendMessageOrEmail(params: SendResetPasswordEmailMsg) {
-  await defHttp.post(
-    {
-      params: params,
-      url: Api.sendMessageOrEmail
-    }
-  );
+  await defHttp.post({
+    params: params,
+    url: Api.sendMessageOrEmail,
+  });
 }
 
-export function getTenantRoles(tenantCode:string){
-  return defHttp.get(
-    {
-      params:tenantCode,
-      url:Api.getTenantRoles
-    }
-  );
+export function getTenantRoles(tenantCode: string) {
+  return defHttp.get({
+    params: tenantCode,
+    url: Api.getTenantRoles,
+  });
 }

-import {BaseQueryParams, BaseQueryRequest} from "../base";
+import { BaseQueryParams, BaseQueryRequest } from '../base';
 
 export enum TenantStatusEnum {
   NORMAL = 'NORMAL',
@@ -54,13 +54,13 @@ export interface UserDTO {
   accountExpireTime: string;
   createTime: string;
   updateTime: string;
-  userStatusEnum: UserStatusEnum
+  userStatusEnum: UserStatusEnum;
   hasPassword?: boolean;
 }
 
 export enum MessageTypeEnum {
   EMAIL_MESSAGE = 'EMAIL_MESSAGE',
-  PHONE_MESSAGE = 'PHONE_MESSAGE'
+  PHONE_MESSAGE = 'PHONE_MESSAGE',
 }
 
 export class SendResetPasswordEmailMsg {
@@ -71,13 +71,12 @@ export class SendResetPasswordEmailMsg {
     this.userId = userId;
     this.messageTypeEnum = msgType;
   }
-
 }
 
 export class TenantPageRequest extends BaseQueryRequest {
   tenantName: string | undefined;
 
-  constructor(page: number = 1, pageSize: number = 10, tenantName?: string) {
+  constructor(page = 1, pageSize = 10, tenantName?: string) {
     super(page, pageSize);
     this.tenantName = tenantName;
   }

@@ -5,7 +5,7 @@
 <template>
   <div class="anticon" :class="getAppLogoClass" @click="goHome">
     <img src="../../../assets/images/logo.png" />
-    <div class="ml-2  md:opacity-100" :class="getTitleClass" v-show="showTitle">
+    <div class="ml-2 md:opacity-100" :class="getTitleClass" v-show="showTitle">
       {{ title }}
     </div>
   </div>

@@ -75,7 +75,7 @@ export function useDrawer(): UseDrawerReturnType {
 
     openDrawer: <T = any>(visible = true, data?: T, openOnSet = true): void => {
       getInstance()?.setDrawerProps({
-        visible: visible,
+        visible,
       });
       if (!data) return;
 

-<template><BasicModal
-  width="800px"
-  :title="t('component.upload.upload')"
-  :okText="t('component.upload.save')"
-  v-bind="$attrs"
-  @register="register"
-  @ok="handleOk"
-  :closeFunc="handleCloseFunc"
-  :maskClosable="false"
-  :keyboard="false"
-  wrapClassName="upload-modal"
-  :okButtonProps="getOkButtonProps"
-  :cancelButtonProps="{ disabled: isUploadingRef }"
->
-
+<template
+  ><BasicModal
+    width="800px"
+    :title="t('component.upload.upload')"
+    :okText="t('component.upload.save')"
+    v-bind="$attrs"
+    @register="register"
+    @ok="handleOk"
+    :closeFunc="handleCloseFunc"
+    :maskClosable="false"
+    :keyboard="false"
+    wrapClassName="upload-modal"
+    :okButtonProps="getOkButtonProps"
+    :cancelButtonProps="{ disabled: isUploadingRef }"
+  >
     <template #centerFooter>
       <a-button
         @click="handleStartUpload"

@@ -27,5 +27,4 @@ const repeatDirective: Directive = {
     });
   },
 };
-
 export default repeatDirective;

-export enum TenantCodeEnum{
-  SYS_ADMIN_CODE="DEFAULT_SYS_ADMIN_TENANT_CODE"
+export enum TenantCodeEnum {
+  SYS_ADMIN_CODE = 'DEFAULT_SYS_ADMIN_TENANT_CODE',
 }

 export enum MessageEnum {
-  IS_SMS="PHONE_MESSAGE",
-  IS_EMAIL="EMAIL_MESSAGE",
+  IS_SMS = 'PHONE_MESSAGE',
+  IS_EMAIL = 'EMAIL_MESSAGE',
 }

@@ -10,5 +10,5 @@ export enum PageEnum {
   //消息配置
   MESSAGE_CONFIG = '/config/message',
   //设备配置
-  DEVICE_PROFILE = '/deviceManager/deviceProfile'
+  DEVICE_PROFILE = '/deviceManager/deviceProfile',
 }

-export enum InputRegExp{
+export enum InputRegExp {
   /**
    * 密码中必须包含大小写 字母、数字、特称字符，至少8个字符，最多30个字符；
    */
-  PASSWORD_INPUT='(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}'
+  PASSWORD_INPUT = '(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}',
 }

 export enum RoleEnum {
-  ROLE_SYS_ADMIN = "ROLE_SYS_ADMIN",
-  ROLE_TENANT_ADMIN = "ROLE_TENANT_ADMIN",
-  ROLE_NORMAL_USER = "ROLE_NORMAL_USER",
-  ROLE_PLATFORM_ADMIN="ROLE_PLATFORM_ADMIN"
+  ROLE_SYS_ADMIN = 'ROLE_SYS_ADMIN',
+  ROLE_TENANT_ADMIN = 'ROLE_TENANT_ADMIN',
+  ROLE_NORMAL_USER = 'ROLE_NORMAL_USER',
+  ROLE_PLATFORM_ADMIN = 'ROLE_PLATFORM_ADMIN',
 }

+export function useChildrenIdsRemoveParentId(str, arr) {
+  const index = arr.indexOf(str);
+  arr.splice(index, 1);
+  return arr;
+}

 export default {
-  common:{
-    createTime:"create time",
-    updateTime:"update time",
-    operation:"operation",
-    remark:"remark",
-    enable:"enable",
-    disable:"disable",
-    sort:"sort",
-    status:"status",
+  common: {
+    createTime: 'create time',
+    updateTime: 'update time',
+    operation: 'operation',
+    remark: 'remark',
+    enable: 'enable',
+    disable: 'disable',
+    sort: 'sort',
+    status: 'status',
   },
-   tenant:{
-       tenant:"tenant",
-       tenantManagement:"tenant management",
-       tenantSetting:"tenant setting"
-   },
-  organization:{
-    queryOrganizationName:"organization name",
-    toolOrganizationList:"organization list",
-    toolCreateOrganization:"create organization",
-    toolEditOrganization:"edit organization",
-    parentOrganization:"parent organization",
+  tenant: {
+    tenant: 'tenant',
+    tenantManagement: 'tenant management',
+    tenantSetting: 'tenant setting',
   },
-  dept:{
-    queryDeptName:"dept name",
-    queryDeptStatus:"status",
-    toolDeptList:"dept list",
-    toolCreateDept:"create dept",
-    toolEditDept:"edit dept",
-    tableTitleDeptSort:"sort",
-    tableTitleDeptCreateTime:"create time",
-    tableTitleDeptOperation:"operation",
-    drawerTitleDeptEnable:"enable",
-    drawerTitleDeptDisable:"disable",
-    drawerTitleDeptParentDept:"parent dept",
-    tableTitleMemo:"memo"
+  organization: {
+    queryOrganizationName: 'organization name',
+    toolOrganizationList: 'organization list',
+    toolCreateOrganization: 'create organization',
+    toolEditOrganization: 'edit organization',
+    parentOrganization: 'parent organization',
   },
-   system:{
-       system:"system",
-       accountManagement:"account management",
-       roleManagement:"role management",
-       menuManagement:"menu management",
-       deptManagement:"dept management",
-       modifyPassword:"modify password",
-       pageSystemTitleCreateMenu:"create menu",
-       pageSystemTitleCreateTenant:"new tenant",
-       pageSystemTitleEditMenu:"edit menu",
-       pageSystemTitleEditTenant:"edit tenant",
-       pageSystemTitleOperation:"operation",
-       pageSystemTitleWhetherDelete:"Are you sure to delete",
-       pageSystemTitleMenuList:"menu list",
-       menuEditPagesMenuType:"menu type",
-       menuEditPagesDirectory:"directory",
-       menuEditPagesMenu:"menu",
-       menuEditPagesButton:"button",
-       menuEditPagesParentMenu:"parent menu",
-       menuEditPagesRouterAddress:"router address",
-       menuEditPagesComponentsPath:"components",
-       menuEditPagesIsExt:"is ext",
-       menuEditPagesIsKeepAlive:"is keep alive",
-       menuEditPagesIsHide:"is hide",
-       menuEditPagesYes:"yes",
-       menuEditPagesNo:"no",
-       tableTitleSystemMenuName:"menu name",
-       tableTitleSystemIcon:"icon",
-       tableTitleSystemPermissionTag:"permission tag",
-       tableTitleSystemComponents:"components",
-       tableTitleSystemSort:"sort",
-       tableTitleSystemStatus:"status",
-       tableTitleSystemCreateTime:"create time",
-       tableTitleSystemEnable:"enable",
-       tableTitleSystemStop:"disable",
-       tableSuccessStatus:"success",
-       tableFailedStatus:"failed",
-   }
-  };
+  dept: {
+    queryDeptName: 'dept name',
+    queryDeptStatus: 'status',
+    toolDeptList: 'dept list',
+    toolCreateDept: 'create dept',
+    toolEditDept: 'edit dept',
+    tableTitleDeptSort: 'sort',
+    tableTitleDeptCreateTime: 'create time',
+    tableTitleDeptOperation: 'operation',
+    drawerTitleDeptEnable: 'enable',
+    drawerTitleDeptDisable: 'disable',
+    drawerTitleDeptParentDept: 'parent dept',
+    tableTitleMemo: 'memo',
+  },
+  system: {
+    system: 'system',
+    accountManagement: 'account management',
+    roleManagement: 'role management',
+    menuManagement: 'menu management',
+    deptManagement: 'dept management',
+    modifyPassword: 'modify password',
+    pageSystemTitleCreateMenu: 'create menu',
+    pageSystemTitleCreateTenant: 'new tenant',
+    pageSystemTitleEditMenu: 'edit menu',
+    pageSystemTitleEditTenant: 'edit tenant',
+    pageSystemTitleOperation: 'operation',
+    pageSystemTitleWhetherDelete: 'Are you sure to delete',
+    pageSystemTitleMenuList: 'menu list',
+    menuEditPagesMenuType: 'menu type',
+    menuEditPagesDirectory: 'directory',
+    menuEditPagesMenu: 'menu',
+    menuEditPagesButton: 'button',
+    menuEditPagesParentMenu: 'parent menu',
+    menuEditPagesRouterAddress: 'router address',
+    menuEditPagesComponentsPath: 'components',
+    menuEditPagesIsExt: 'is ext',
+    menuEditPagesIsKeepAlive: 'is keep alive',
+    menuEditPagesIsHide: 'is hide',
+    menuEditPagesYes: 'yes',
+    menuEditPagesNo: 'no',
+    tableTitleSystemMenuName: 'menu name',
+    tableTitleSystemIcon: 'icon',
+    tableTitleSystemPermissionTag: 'permission tag',
+    tableTitleSystemComponents: 'components',
+    tableTitleSystemSort: 'sort',
+    tableTitleSystemStatus: 'status',
+    tableTitleSystemCreateTime: 'create time',
+    tableTitleSystemEnable: 'enable',
+    tableTitleSystemStop: 'disable',
+    tableSuccessStatus: 'success',
+    tableFailedStatus: 'failed',
+  },
+};

@@ -2,7 +2,7 @@ export default {
   api: {
     operationFailed: 'Operation failed',
     errorTip: 'Error Tip',
-    passwordOrUserNameError:'username or password not correct',
+    passwordOrUserNameError: 'username or password not correct',
     loginFailed: 'Login Failed',
     errorMessage: 'The operation failed, the system is abnormal!',
     timeoutMessage: 'Login timed out, please log in again!',

 export default {
-    common:{
-      createTime:"创建时间",
-      updateTime:"更新时间",
-      operation:"操作",
-      remark:"备注",
-      enable:"启用",
-      disable:"禁用",
-      sort:"排序",
-      status:"状态"
-    },
-   tenant:{
-       tenant:"租户",
-       tenantManagement:"租户管理",
-       tenantSetting:"租户设置"
-   },
-  organization:{
-    queryOrganizationName:"组织名称",
-    toolOrganizationList:"组织列表",
-    toolCreateOrganization:"新增组织",
-    toolEditOrganization:"编辑组织",
-    parentOrganization:"上级组织",
+  common: {
+    createTime: '创建时间',
+    updateTime: '更新时间',
+    operation: '操作',
+    remark: '备注',
+    enable: '启用',
+    disable: '禁用',
+    sort: '排序',
+    status: '状态',
   },
-  dept:{
-    queryDeptName:"部门名称",
-    queryDeptStatus:"状态",
-    toolDeptList:"部门列表",
-    toolCreateDept:"新增部门",
-    toolEditDept:"编辑部门",
-    tableTitleDeptSort:"排序",
-    tableTitleDeptCreateTime:"创建时间",
-    tableTitleDeptOperation:"操作",
-    drawerTitleDeptEnable:"启用",
-    drawerTitleDeptDisable:"停用",
-    drawerTitleDeptParentDept:"上级部门",
-    tableTitleMemo:"备注"
+  tenant: {
+    tenant: '租户',
+    tenantManagement: '租户管理',
+    tenantSetting: '租户设置',
   },
-   system:{
-       system:"系统管理",
-       accountManagement:"账号管理",
-       roleManagement:"角色管理",
-       menuManagement:"菜单管理",
-       deptManagement:"部门管理",
-       modifyPassword:"修改密码",
-       pageSystemTitleCreateMenu:"新增菜单",
-       pageSystemTitleCreateTenant:"新增租户",
-       pageSystemTitleEditMenu:"编辑菜单",
-       pageSystemTitleEditTenant:"编辑租户",
-       pageSystemTitleOperation:"操作",
-       pageSystemTitleWhetherDelete:"是否确认删除",
-       pageSystemTitleMenuList:"菜单列表",
-       menuEditPagesMenuType:"菜单类型",
-       menuEditPagesDirectory:"目录",
-       menuEditPagesMenu:"菜单",
-       menuEditPagesButton:"按钮",
-       menuEditPagesParentMenu:"上级菜单",
-       menuEditPagesRouterAddress:"路由地址",
-       menuEditPagesComponentsPath:"组件路径",
-       menuEditPagesIsExt:"是否外链",
-       menuEditPagesIsKeepAlive:"是否缓存",
-       menuEditPagesIsHide:"是否隐藏",
-       menuEditPagesYes:"是",
-       menuEditPagesNo:"否",
-       tableTitleSystemMenuName:"菜单名称",
-       tableTitleSystemIcon:"图标",
-       tableTitleSystemPermissionTag:"权限标识",
-       tableTitleSystemComponents:"组件",
-       tableTitleSystemSort:"排序",
-       tableTitleSystemStatus:"状态",
-       tableTitleSystemCreateTime:"创建时间",
-       tableTitleSystemEnable:"启用",
-       tableTitleSystemStop:"停用",
-       tableSuccessStatus:"成功",
-       tableFailedStatus:"失败",
-   }
-  };
+  organization: {
+    queryOrganizationName: '组织名称',
+    toolOrganizationList: '组织列表',
+    toolCreateOrganization: '新增组织',
+    toolEditOrganization: '编辑组织',
+    parentOrganization: '上级组织',
+  },
+  dept: {
+    queryDeptName: '部门名称',
+    queryDeptStatus: '状态',
+    toolDeptList: '部门列表',
+    toolCreateDept: '新增部门',
+    toolEditDept: '编辑部门',
+    tableTitleDeptSort: '排序',
+    tableTitleDeptCreateTime: '创建时间',
+    tableTitleDeptOperation: '操作',
+    drawerTitleDeptEnable: '启用',
+    drawerTitleDeptDisable: '停用',
+    drawerTitleDeptParentDept: '上级部门',
+    tableTitleMemo: '备注',
+  },
+  system: {
+    system: '系统管理',
+    accountManagement: '账号管理',
+    roleManagement: '角色管理',
+    menuManagement: '菜单管理',
+    deptManagement: '部门管理',
+    modifyPassword: '修改密码',
+    pageSystemTitleCreateMenu: '新增菜单',
+    pageSystemTitleCreateTenant: '新增租户',
+    pageSystemTitleEditMenu: '编辑菜单',
+    pageSystemTitleEditTenant: '编辑租户',
+    pageSystemTitleOperation: '操作',
+    pageSystemTitleWhetherDelete: '是否确认删除',
+    pageSystemTitleMenuList: '菜单列表',
+    menuEditPagesMenuType: '菜单类型',
+    menuEditPagesDirectory: '目录',
+    menuEditPagesMenu: '菜单',
+    menuEditPagesButton: '按钮',
+    menuEditPagesParentMenu: '上级菜单',
+    menuEditPagesRouterAddress: '路由地址',
+    menuEditPagesComponentsPath: '组件路径',
+    menuEditPagesIsExt: '是否外链',
+    menuEditPagesIsKeepAlive: '是否缓存',
+    menuEditPagesIsHide: '是否隐藏',
+    menuEditPagesYes: '是',
+    menuEditPagesNo: '否',
+    tableTitleSystemMenuName: '菜单名称',
+    tableTitleSystemIcon: '图标',
+    tableTitleSystemPermissionTag: '权限标识',
+    tableTitleSystemComponents: '组件',
+    tableTitleSystemSort: '排序',
+    tableTitleSystemStatus: '状态',
+    tableTitleSystemCreateTime: '创建时间',
+    tableTitleSystemEnable: '启用',
+    tableTitleSystemStop: '停用',
+    tableSuccessStatus: '成功',
+    tableFailedStatus: '失败',
+  },
+};

@@ -2,7 +2,7 @@ export default {
   api: {
     operationFailed: '操作失败',
     errorTip: '错误提示',
-    passwordOrUserNameError:'用户名或密码不正确',
+    passwordOrUserNameError: '用户名或密码不正确',
     loginFailed: '登录失败',
     errorMessage: '操作失败,系统异常!',
     timeoutMessage: '登录超时,请重新登录!',

@@ -63,9 +63,9 @@ export function initAppConfigStore() {
   // init store
   localeStore.initLocale();
 
-  const userInfo = Persistent.getLocal(USER_INFO_KEY) as UserInfo
+  const userInfo = Persistent.getLocal(USER_INFO_KEY) as UserInfo;
   const userStore = useUserStore();
-  if(userInfo){
+  if (userInfo) {
     userStore.setUserInfo(userInfo);
     userStore.jwtToken = Persistent.getLocal(JWT_TOKEN_KEY) as string;
     userStore.refreshToken = Persistent.getLocal(REFRESH_TOKEN_KEY) as string;

@@ -26,6 +26,9 @@ if (import.meta.env.DEV) {
 async function bootstrap() {
   const app = createApp(App);
 
+  // app.use(VueBaidu, {
+  //   ak: '7uOPPyAHn2Y2ZryeQqHtcRqtIY374vKa',
+  // });
   // Configure store
   setupStore(app);
 

@@ -188,7 +188,7 @@ export const usePermissionStore = defineStore({
             routeList = (await getMenuList()) as AppRouteRecordRaw[];
           } catch (error) {
             console.error(error);
-          }          // Dynamically introduce components
+          } // Dynamically introduce components
           routeList = transformObjToRoute(routeList);
 
           //  Background routing to menu structure

@@ -4,15 +4,21 @@ import { defineStore } from 'pinia';
 import { store } from '/@/store';
 import { RoleEnum } from '/@/enums/roleEnum';
 import { PageEnum } from '/@/enums/pageEnum';
-import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY, ROLES_KEY, TOKEN_KEY, USER_INFO_KEY } from '/@/enums/cacheEnum';
+import {
+  JWT_TOKEN_KEY,
+  REFRESH_TOKEN_KEY,
+  ROLES_KEY,
+  TOKEN_KEY,
+  USER_INFO_KEY,
+} from '/@/enums/cacheEnum';
 import { getAuthCache, setAuthCache } from '/@/utils/auth';
 import {
   LoginParams,
   LoginResultModel,
   RefreshTokenParams,
-  SmsLoginParams
+  SmsLoginParams,
 } from '/@/api/sys/model/userModel';
-import {doRefreshToken, getMyInfo, loginApi, smsCodeLoginApi} from '/@/api/sys/user';
+import { doRefreshToken, getMyInfo, loginApi, smsCodeLoginApi } from '/@/api/sys/user';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { router } from '/@/router';
@@ -26,8 +32,8 @@ interface UserState {
   roleList: RoleEnum[];
   sessionTimeout?: boolean;
   lastUpdateTime: number;
-  jwtToken?:string;
-  refreshToken?:string;
+  jwtToken?: string;
+  refreshToken?: string;
 }
 
 export const useUserStore = defineStore({
@@ -38,7 +44,7 @@ export const useUserStore = defineStore({
     // token
     jwtToken: undefined,
     //refresh Token
-    refreshToken:undefined,
+    refreshToken: undefined,
     // roleList
     roleList: [],
     // Whether the login expired
@@ -67,11 +73,11 @@ export const useUserStore = defineStore({
     },
   },
   actions: {
-    storeToken(jwtToken:string,refreshToken:string){
+    storeToken(jwtToken: string, refreshToken: string) {
       this.jwtToken = jwtToken;
       this.refreshToken = refreshToken;
-      setAuthCache(JWT_TOKEN_KEY,jwtToken);
-      setAuthCache(REFRESH_TOKEN_KEY,refreshToken);
+      setAuthCache(JWT_TOKEN_KEY, jwtToken);
+      setAuthCache(REFRESH_TOKEN_KEY, refreshToken);
     },
     setToken(info: string | undefined) {
       this.token = info;
@@ -107,34 +113,34 @@ export const useUserStore = defineStore({
       try {
         const { goHome = true, mode, ...loginParams } = params;
         const data = await loginApi(loginParams, mode);
-        return this.process(data,goHome);
+        return this.process(data, goHome);
       } catch (error) {
         return Promise.reject(error);
       }
     },
-     async process(data: LoginResultModel, goHome?: boolean): Promise<UserInfo | null> {
-       const {token, refreshToken} = data;
-       this.storeToken(token, refreshToken);
-       // get user info
-       const userInfo = await this.getMyUserInfoAction();
+    async process(data: LoginResultModel, goHome?: boolean): Promise<UserInfo | null> {
+      const { token, refreshToken } = data;
+      this.storeToken(token, refreshToken);
+      // get user info
+      const userInfo = await this.getMyUserInfoAction();
 
-       const sessionTimeout = this.sessionTimeout;
-       if (sessionTimeout) {
-         this.setSessionTimeout(false);
-       } else if (goHome) {
-         const permissionStore = usePermissionStore();
-         if (!permissionStore.isDynamicAddedRoute) {
-           const routes = await permissionStore.buildRoutesAction();
-           routes.forEach((route) => {
-             router.addRoute(route as unknown as RouteRecordRaw);
-           });
-           router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw);
-           permissionStore.setDynamicAddedRoute(true);
-         }
-         await router.replace(userInfo.homePath || PageEnum.BASE_HOME);
-       }
-       return userInfo;
-     },
+      const sessionTimeout = this.sessionTimeout;
+      if (sessionTimeout) {
+        this.setSessionTimeout(false);
+      } else if (goHome) {
+        const permissionStore = usePermissionStore();
+        if (!permissionStore.isDynamicAddedRoute) {
+          const routes = await permissionStore.buildRoutesAction();
+          routes.forEach((route) => {
+            router.addRoute(route as unknown as RouteRecordRaw);
+          });
+          router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw);
+          permissionStore.setDynamicAddedRoute(true);
+        }
+        await router.replace(userInfo.homePath || PageEnum.BASE_HOME);
+      }
+      return userInfo;
+    },
     async smsCodelogin(
       params: SmsLoginParams & {
         goHome?: boolean;
@@ -144,7 +150,7 @@ export const useUserStore = defineStore({
       try {
         const { goHome = true, mode, ...loginParams } = params;
         const data = await smsCodeLoginApi(loginParams, mode);
-        return this.process(data,goHome);
+        return this.process(data, goHome);
       } catch (error) {
         return Promise.reject(error);
       }
@@ -167,21 +173,21 @@ export const useUserStore = defineStore({
       //   console.log('注销Token失败');
       // }
       this.resetState();
-      setAuthCache(JWT_TOKEN_KEY,undefined);
-      setAuthCache(REFRESH_TOKEN_KEY,undefined);
+      setAuthCache(JWT_TOKEN_KEY, undefined);
+      setAuthCache(REFRESH_TOKEN_KEY, undefined);
       // this.setSessionTimeout(false);
       // goLogin && router.push(PageEnum.BASE_LOGIN);
       await router.push(PageEnum.BASE_LOGIN);
     },
 
-    async doRefresh(){
-      try{
-        const req = {"refreshToken":this.refreshToken} as RefreshTokenParams;
+    async doRefresh() {
+      try {
+        const req = { refreshToken: this.refreshToken } as RefreshTokenParams;
         const data = await doRefreshToken(req);
         const { token, refreshToken } = data;
-        this.storeToken(token,refreshToken);
-      }catch(error){
-        this.logout()
+        this.storeToken(token, refreshToken);
+      } catch (error) {
+        this.logout();
       }
     },
 
@@ -207,4 +213,3 @@ export const useUserStore = defineStore({
 export function useUserStoreWithOut() {
   return useUserStore(store);
 }
-

 import { Persistent, BasicKeys } from '/@/utils/cache/persistent';
 import { CacheTypeEnum } from '/@/enums/cacheEnum';
 import projectSetting from '/@/settings/projectSetting';
-import { JWT_TOKEN_KEY,REFRESH_TOKEN_KEY } from '/@/enums/cacheEnum';
+import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY } from '/@/enums/cacheEnum';
 
 const { permissionCacheType } = projectSetting;
 const isLocal = permissionCacheType === CacheTypeEnum.LOCAL;
@@ -20,9 +20,9 @@ export function clearAuthCache(immediate = true) {
   const fn = isLocal ? Persistent.clearLocal : Persistent.clearSession;
   return fn(immediate);
 }
-export function getJwtToken(){
-   return getAuthCache(JWT_TOKEN_KEY);
+export function getJwtToken() {
+  return getAuthCache(JWT_TOKEN_KEY);
 }
-export function getRefreshToken(){
+export function getRefreshToken() {
   return getAuthCache(REFRESH_TOKEN_KEY);
 }

@@ -105,11 +105,23 @@ window.addEventListener('beforeunload', function () {
   // LOCK_INFO_KEY 在锁屏和解锁时写入，此处也不应修改
   ls.set(APP_LOCAL_CACHE_KEY, {
     ...omit(localMemory.getCache, LOCK_INFO_KEY),
-    ...pick(ls.get(APP_LOCAL_CACHE_KEY), [TOKEN_KEY,JWT_TOKEN_KEY,REFRESH_TOKEN_KEY, USER_INFO_KEY, LOCK_INFO_KEY]),
+    ...pick(ls.get(APP_LOCAL_CACHE_KEY), [
+      TOKEN_KEY,
+      JWT_TOKEN_KEY,
+      REFRESH_TOKEN_KEY,
+      USER_INFO_KEY,
+      LOCK_INFO_KEY,
+    ]),
   });
   ss.set(APP_SESSION_CACHE_KEY, {
     ...omit(sessionMemory.getCache, LOCK_INFO_KEY),
-    ...pick(ss.get(APP_SESSION_CACHE_KEY), [TOKEN_KEY,JWT_TOKEN_KEY,REFRESH_TOKEN_KEY, USER_INFO_KEY, LOCK_INFO_KEY]),
+    ...pick(ss.get(APP_SESSION_CACHE_KEY), [
+      TOKEN_KEY,
+      JWT_TOKEN_KEY,
+      REFRESH_TOKEN_KEY,
+      USER_INFO_KEY,
+      LOCK_INFO_KEY,
+    ]),
   });
 });
 

+export const copyTransFun = (arr: any[]) => {
+  arr.forEach((item) => {
+    if (item.name) {
+      item.label = item.name;
+      delete item.name;
+    }
+    if (item.id) {
+      item.value = item.id;
+      delete item.id;
+    }
+    if (item.children) {
+      if (item.children.length) {
+        copyTransFun(item.children);
+      }
+    }
+  });
+};

@@ -10,7 +10,7 @@ import { ContentTypeEnum } from '/@/enums/httpEnum';
 import { RequestEnum } from '/@/enums/httpEnum';
 import { useUserStore } from '/@/store/modules/user';
 import { JwtModel } from '/@/api/sys/jwtModel';
-import jwt_decode from "jwt-decode";
+import jwt_decode from 'jwt-decode';
 
 export * from './axiosTransform';
 
@@ -20,14 +20,14 @@ export * from './axiosTransform';
 export class VAxios {
   private axiosInstance: AxiosInstance;
   private readonly options: CreateAxiosOptions;
-  private waitingQueue:any[];
+  private waitingQueue: any[];
   private refreshing = false;
 
   constructor(options: CreateAxiosOptions) {
     this.options = options;
     this.axiosInstance = axios.create(options);
     this.setupInterceptors();
-    this.waitingQueue=[];
+    this.waitingQueue = [];
   }
 
   /**
@@ -69,15 +69,15 @@ export class VAxios {
    * JWT 自动刷新
    * @description: 自动刷新token
    */
-   private isNeedTokenURL(url, arr = ['/auth/login', '/auth/token']) {
+  private isNeedTokenURL(url, arr = ['/auth/login', '/auth/token']) {
     return !arr.some((val) => url.indexOf(val) > -1);
   }
-  
+
   /**
-   * 
-   * @returns 
+   *
+   * @returns
    */
-   private refreshTokenBeforeReq(doRefreshTokenApi: () => Promise<unknown>): Promise<unknown> {
+  private refreshTokenBeforeReq(doRefreshTokenApi: () => Promise<unknown>): Promise<unknown> {
     // 创建一个未完成的promise，把改变状态的resolve方法交给请求token结束后执行
     const promise = new Promise((resolve) => {
       console.log('等待新token');
@@ -88,7 +88,7 @@ export class VAxios {
       this.refreshing = true;
       // 模拟请求刷新Token接口，当接口返回数据时执行then方法 TODO 添加catch捕获异常
       doRefreshTokenApi().then(() => {
-        console.log('刷新token成功，放行队列中的请求',this.waitingQueue.length);
+        console.log('刷新token成功，放行队列中的请求', this.waitingQueue.length);
         this.refreshing = false;
         this.waitingQueue.forEach((cb) => cb());
         this.waitingQueue.length = 0;
@@ -116,19 +116,18 @@ export class VAxios {
     // Request interceptor configuration processing
     this.axiosInstance.interceptors.request.use(async (config: AxiosRequestConfig) => {
       // If cancel repeat request is turned on, then cancel repeat request is prohibited
-     const userStore =  useUserStore();
-     if(userStore && userStore.jwtToken){
-       try{
-       const res = jwt_decode(userStore.jwtToken) as JwtModel;
-       const currentTime = new Date().getTime()/1000;
-       if(currentTime >= res.exp && this.isNeedTokenURL(config.url)){
-         await this.refreshTokenBeforeReq(userStore.doRefresh);
-       }
-       }catch(error){
+      const userStore = useUserStore();
+      if (userStore && userStore.jwtToken) {
+        try {
+          const res = jwt_decode(userStore.jwtToken) as JwtModel;
+          const currentTime = new Date().getTime() / 1000;
+          if (currentTime >= res.exp && this.isNeedTokenURL(config.url)) {
+            await this.refreshTokenBeforeReq(userStore.doRefresh);
+          }
+        } catch (error) {
           userStore.logout();
-       }
-
-     }
+        }
+      }
       const {
         headers: { ignoreCancelToken },
       } = config;

@@ -93,7 +93,7 @@ const transform: AxiosTransform = {
     const token = getJwtToken();
     if (token && (config as Recordable)?.requestOptions?.withToken !== false) {
       // jwt token
-      config.headers["X-Authorization"] = options.authenticationScheme
+      config.headers['X-Authorization'] = options.authenticationScheme
         ? `${options.authenticationScheme} ${token}`
         : token;
     }
@@ -111,10 +111,10 @@ const transform: AxiosTransform = {
    * @description: 响应错误处理
    */
   responseInterceptorsCatch: (error: any) => {
-    const {t} = useI18n();
+    const { t } = useI18n();
     const errorLogStore = useErrorLogStoreWithOut();
     errorLogStore.addAjaxErrorInfo(error);
-    const {response, code, message, config} = error || {};
+    const { response, code, message, config } = error || {};
     const errorMessageMode = config?.requestOptions?.errorMessageMode || 'none';
     const msg: string = response?.data?.msg ?? '';
     const err: string = error?.toString?.() ?? '';
@@ -130,13 +130,13 @@ const transform: AxiosTransform = {
 
       if (errMessage) {
         if (errorMessageMode === 'modal') {
-          createErrorModal({title: t('sys.api.errorTip'), content: errMessage});
+          createErrorModal({ title: t('sys.api.errorTip'), content: errMessage });
         } else if (errorMessageMode === 'message') {
           createMessage.error(errMessage);
         }
         return Promise.reject(error);
       }
-    } catch (error) {
+    } catch (error: any) {
       throw new Error(error);
     }
 

 /* list To Tree */
 
-import {getMenuListResultModel} from "/@/api/sys/model/menuModel";
-import {useI18n} from "/@/hooks/web/useI18n";
-
+import { getMenuListResultModel } from '/@/api/sys/model/menuModel';
+import { useI18n } from '/@/hooks/web/useI18n';
 
 export function listToTree(lists: getMenuListResultModel): getMenuListResultModel {
   const { t } = useI18n(); //加载国际化
-  lists.forEach(goods => {
+  lists.forEach((goods) => {
     goods['menuName'] = t(goods.meta.title); // 为goods添加属性menuName
 
     // console.log(goods.children?.length);
-    if(goods.children?.length){
-      goods.children.forEach(goodChildren => {
+    if (goods.children?.length) {
+      goods.children.forEach((goodChildren) => {
         goodChildren['menuName'] = t(goodChildren.meta.title); // 为goodChildren添加属性menuName
-      })
+      });
     }
-  })
+  });
 
   return lists;
-
 }
-
-
-
-
-
-
-

+import { FormSchema } from '/@/components/Table';
+export const formSchema: FormSchema[] = [
+  {
+    field: 'organization',
+    label: '',
+    component: 'TreeSelect',
+    componentProps: {},
+  },
+  {
+    field: 'organization',
+    label: '',
+    component: 'Select',
+    componentProps: {},
+  },
+  {
+    field: 'device',
+    label: '',
+    slot: 'device',
+    component: 'Input',
+  },
+];

+<template>
+  <div class="wrapper">
+    <div ref="wrapRef" :style="{ height, width }"> </div>
+    <div class="right-wrap">
+      <BasicForm @register="registerForm">
+        <template #device>
+          <div class="flex justify-between">
+            <a-input v-model:value="deviceValue" placeholder="请输入设备名称" style="width: 70%" />
+            <a-button color="success" @click="handleReset" class="w-1/4">复位查询</a-button>
+          </div>
+        </template>
+      </BasicForm>
+      <div>
+        <RadioGroup v-model:value="deviceStatus">
+          <Radio :value="1">全部</Radio>
+          <Radio :value="2">在线</Radio>
+          <Radio :value="3">离线</Radio>
+          <Radio :value="4">报警</Radio>
+        </RadioGroup>
+        <div class="scroll-wrap">
+          <ScrollContainer ref="scrollRef">
+            <template
+              v-for="(item, index) in 10"
+              :key="index"
+              :class="{ active: currentIndex == index }"
+              @click="bander(index)"
+            >
+              <div class="flex" style="border-bottom: 1px solid #ccc">
+                <div>
+                  <div class="flex">
+                    <div class="font-bold ml-5">名称 </div>
+                    <div class="ml-5">发动机{{ item }}</div>
+                  </div>
+                  <div class="flex">
+                    <div class="font-bold ml-5">位置 </div>
+                    <div class="ml-5 font-bold">四川省成都市高新区{{ item }}</div>
+                  </div>
+                </div>
+                <div class="self-center ml-10"><Tag color="default">离线</Tag></div>
+              </div>
+            </template>
+          </ScrollContainer>
+        </div>
+        <div class="flex justify-end">
+          <Pagination v-model:current="current" :total="50" size="small" show-less-items />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, nextTick, unref, onMounted } from 'vue';
+  import { useScript } from '/@/hooks/web/useScript';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema } from './config.data';
+  import { RadioGroup, Radio, Tag, Pagination } from 'ant-design-vue';
+  import { ScrollContainer, ScrollActionType } from '/@/components/Container/index';
+  export default defineComponent({
+    name: 'BaiduMap',
+    components: {
+      BasicForm,
+      RadioGroup,
+      Radio,
+      Tag,
+      ScrollContainer,
+      Pagination,
+    },
+    props: {
+      width: {
+        type: String,
+        default: '100%',
+      },
+      height: {
+        type: String,
+        default: 'calc(100vh - 78px)',
+      },
+    },
+
+    setup() {
+      const BAI_DU_MAP_URL =
+        'https://api.map.baidu.com/getscript?v=3.0&ak=7uOPPyAHn2Y2ZryeQqHtcRqtIY374vKa';
+      const wrapRef = ref<HTMLDivElement | null>(null);
+      const scrollRef = ref<Nullable<ScrollActionType>>(null);
+      const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
+      async function initMap() {
+        await toPromise();
+        await nextTick();
+        const wrapEl = unref(wrapRef);
+        const BMap = (window as any).BMap;
+        if (!wrapEl) return;
+        const map = new BMap.Map(wrapEl);
+        const point = new BMap.Point(116.14282, 35.19515);
+        map.centerAndZoom(point, 15);
+        map.enableScrollWheelZoom(true);
+      }
+      onMounted(() => {
+        initMap();
+      });
+      const deviceValue = ref('');
+      const deviceStatus = ref(1);
+      const current = ref(2);
+      const currentIndex = ref(1);
+      const bander = (index: number) => {
+        currentIndex.value = index;
+      };
+      const [registerForm] = useForm({
+        labelWidth: 90,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+      });
+      const handleReset = () => {
+        deviceValue.value = '';
+      };
+      return {
+        wrapRef,
+        registerForm,
+        deviceValue,
+        deviceStatus,
+        handleReset,
+        scrollRef,
+        current,
+        currentIndex,
+        bander,
+      };
+    },
+  });
+</script>
+
+<style scoped>
+  .wrapper {
+    position: relative;
+  }
+  .active {
+    background-color: #fff;
+  }
+  .right-wrap {
+    padding-top: 10px;
+    width: 20%;
+    height: 80%;
+    position: absolute;
+    right: 5%;
+    top: 10%;
+    background-color: #f3f8fe;
+  }
+  .scroll-wrap {
+    height: 450px;
+    background-color: #f3f8fe;
+  }
+</style>

+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    @register="registerDrawer"
+    showFooter
+    :title="getTitle"
+    width="30%"
+    @ok="handleSubmit"
+  >
+    <BasicForm @register="registerForm" />
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, computed, unref } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { formSchema } from './config.data';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { saveOrEditAlarmContact } from '/@/api/alarm/contact/alarmContact';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  export default defineComponent({
+    name: 'ContactDrawer',
+    components: { BasicDrawer, BasicForm },
+    emits: ['success', 'register'],
+    setup(_, { emit }) {
+      const isUpdate = ref(true);
+
+      const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
+        labelWidth: 120,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+      });
+
+      const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+        await resetFields();
+        setDrawerProps({ confirmLoading: false });
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+          await setFieldsValue({
+            ...data.record,
+          });
+        }
+      });
+
+      const getTitle = computed(() => (!unref(isUpdate) ? '新增联系人配置' : '编辑联系人配置'));
+
+      async function handleSubmit() {
+        try {
+          const values = await validate();
+          const { createMessage } = useMessage();
+          setDrawerProps({ confirmLoading: true });
+          let saveMessage = '添加成功';
+          let updateMessage = '修改成功';
+          await saveOrEditAlarmContact(values, unref(isUpdate));
+          closeDrawer();
+          emit('success');
+          createMessage.success(unref(isUpdate) ? updateMessage : saveMessage);
+        } finally {
+          setDrawerProps({ confirmLoading: false });
+        }
+      }
+
+      return {
+        getTitle,
+        registerDrawer,
+        registerForm,
+        handleSubmit,
+      };
+    },
+  });
+</script>

+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { getOrganizationList } from '/@/api/system/system';
+import { copyTransFun } from '/@/utils/fnUtils';
+// 表格列数据
+export const columns: BasicColumn[] = [
+  {
+    title: '姓名',
+    dataIndex: 'username',
+    width: 120,
+  },
+  {
+    title: '所属组织',
+    dataIndex: 'organizationId',
+    width: 160,
+  },
+  {
+    title: '手机',
+    dataIndex: 'phone',
+    width: 160,
+  },
+  {
+    title: '邮箱',
+    dataIndex: 'email',
+    width: 160,
+  },
+  {
+    title: '微信',
+    dataIndex: 'wechat',
+    width: 180,
+  },
+  {
+    title: '备注',
+    dataIndex: 'remark',
+    width: 120,
+  },
+  {
+    title: '添加人',
+    dataIndex: 'addPeople',
+    width: 180,
+  },
+  {
+    title: '添加时间',
+    dataIndex: 'createTime',
+    width: 180,
+  },
+  {
+    title: '更新时间',
+    dataIndex: 'updateTime',
+    width: 180,
+  },
+];
+
+// 查询字段
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'username',
+    label: '联系人姓名',
+    component: 'Input',
+    colProps: { span: 6 },
+    componentProps: {
+      placeholder: '请输入联系人姓名',
+    },
+  },
+];
+
+// 弹框配置项
+export const formSchema: FormSchema[] = [
+  {
+    field: 'username',
+    label: '联系人姓名',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入联系人姓名',
+    },
+  },
+  {
+    field: 'organizationId',
+    label: '所属组织',
+    component: 'ApiTreeSelect',
+    componentProps: {
+      api: async () => {
+        const data = await getOrganizationList();
+        copyTransFun(data as any as any[]);
+        return data;
+      },
+    },
+  },
+  {
+    field: 'phone',
+    label: '手机号码',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入手机号码',
+    },
+  },
+  {
+    field: 'email',
+    label: '邮箱',
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入邮箱',
+    },
+  },
+  {
+    field: 'wechat',
+    label: '微信',
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入微信号',
+    },
+  },
+  {
+    field: 'addPeople',
+    label: '添加人',
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入添加人',
+    },
+  },
+  {
+    field: 'remark',
+    label: '备注',
+    component: 'InputTextArea',
+    componentProps: {
+      placeholder: '',
+    },
+  },
+  {
+    field: 'id',
+    label: '',
+    component: 'Input',
+    componentProps: {
+      style: {
+        display: 'none',
+      },
+    },
+  },
+];

+<template>
+  <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
+    <OrganizationIdTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
+    <BasicTable @register="registerTable" :searchInfo="searchInfo" class="w-3/4 xl:w-4/5">
+      <template #toolbar>
+        <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增联系人 </a-button>
+        <a-button
+          type="primary"
+          color="error"
+          @click="handleDeleteOrBatchDelete(null)"
+          :disabled="hasBatchDelete"
+        >
+          批量删除
+        </a-button>
+      </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            {
+              label: '编辑',
+              icon: 'clarity:note-edit-line',
+              onClick: handleCreateOrEdit.bind(null, record),
+            },
+            {
+              label: '删除',
+              icon: 'ant-design:delete-outlined',
+              color: 'error',
+              popConfirm: {
+                title: '是否确认删除',
+                confirm: handleDeleteOrBatchDelete.bind(null, record),
+              },
+            },
+          ]"
+        />
+      </template>
+    </BasicTable>
+  </PageWrapper>
+  <ContactDrawer @register="registerDrawer" @success="handleSuccess" />
+</template>
+
+<script lang="ts">
+  import { defineComponent, reactive, ref, computed } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { PageWrapper } from '/@/components/Page';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useDrawer } from '/@/components/Drawer';
+  import ContactDrawer from './ContactDrawer.vue';
+  import OrganizationIdTree from '../../common/OrganizationIdTree.vue';
+  import { getAlarmContact, deleteAlarmContact } from '/@/api/alarm/contact/alarmContact';
+  import { searchFormSchema, columns } from './config.data';
+  export default defineComponent({
+    components: {
+      PageWrapper,
+      OrganizationIdTree,
+      BasicTable,
+      TableAction,
+      ContactDrawer,
+    },
+    setup() {
+      let selectedRowIds = ref<string[]>([]);
+      const hasBatchDelete = computed(() => selectedRowIds.value.length <= 0);
+      // 复选框事件
+      const onSelectRowChange = (selectedRowKeys: string[]) => {
+        selectedRowIds.value = selectedRowKeys;
+      };
+      // 表格hooks
+      const [registerTable, { reload }] = useTable({
+        api: getAlarmContact,
+        columns,
+        formConfig: {
+          labelWidth: 120,
+          schemas: searchFormSchema,
+        },
+        useSearchForm: true,
+        showTableSetting: true,
+        bordered: true,
+        rowSelection: {
+          onChange: onSelectRowChange,
+          type: 'checkbox',
+        },
+        rowKey: 'id',
+        actionColumn: {
+          width: 180,
+          title: '操作',
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+          fixed: 'right',
+        },
+      });
+      // 弹框
+      const [registerDrawer, { openDrawer }] = useDrawer();
+      const { createMessage } = useMessage();
+      const searchInfo = reactive<Recordable>({});
+      // 刷新
+      const handleSuccess = () => {
+        reload();
+      };
+      // 新增或编辑
+      const handleCreateOrEdit = (record: Recordable) => {
+        if (record) {
+          openDrawer(true, {
+            isUpdate: true,
+            record,
+          });
+        } else {
+          openDrawer(true, {
+            isUpdate: false,
+          });
+        }
+      };
+      // 删除或批量删除
+      const handleDeleteOrBatchDelete = async (record?: Recordable) => {
+        if (record) {
+          try {
+            await deleteAlarmContact([record.id]);
+            createMessage.success('删除联系人成功');
+            handleSuccess();
+          } catch (e) {
+            createMessage.error('删除失败');
+          }
+        } else {
+          try {
+            await deleteAlarmContact(selectedRowIds.value);
+            createMessage.success('批量删除联系人成功');
+            handleSuccess();
+          } catch (e) {
+            createMessage.info('删除失败');
+          }
+        }
+      };
+
+      // 树形选择器
+      const handleSelect = (organizationId: string) => {
+        searchInfo.organizationId = organizationId;
+        handleSuccess();
+      };
+      return {
+        searchInfo,
+        hasBatchDelete,
+        handleCreateOrEdit,
+        handleDeleteOrBatchDelete,
+        handleSelect,
+        handleSuccess,
+        registerTable,
+        registerDrawer,
+      };
+    },
+  });
+</script>

-<template>
-  <BasicDrawer
-    v-bind="$attrs"
-    @register="registerDrawer"
-    showFooter
-    :title="getTitle"
-    width="500px"
-    @ok="handleSubmit"
-  >
-    <BasicForm @register="registerForm">
-      <template #iconSelect>
-        <Upload
-          name="avatar"
-          list-type="picture-card"
-          class="avatar-uploader"
-          :show-upload-list="false"
-          :customRequest="customUpload"
-          :before-upload="beforeUpload"
-        >
-          <img v-if="devicePic" :src="devicePic" alt="avatar"/>
-          <div v-else>
-            <loading-outlined v-if="loading"></loading-outlined>
-            <plus-outlined v-else></plus-outlined>
-            <div class="ant-upload-text">图片上传</div>
-          </div>
-        </Upload>
-      </template>
-    </BasicForm>
-  </BasicDrawer>
-</template>
-<script lang="ts">
-  import { defineComponent, ref, computed, unref } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchema } from './device.data';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import {saveOrEditMessageConfig} from "/@/api/message/config";
-  import {useMessage} from "/@/hooks/web/useMessage";
-  import {upload} from "/@/api/oss/ossFileUploader";
-  import {message, Upload} from "ant-design-vue";
-  import {FileItem} from "/@/components/Upload/src/typing";
-
-  export default defineComponent({
-    name: 'DeviceDrawer',
-    components: { BasicDrawer, BasicForm,Upload },
-    emits: ['success', 'register'],
-    setup(_, { emit }) {
-      const isUpdate = ref(true);
-      const devicePic = ref("");
-      const [registerForm, {  validate,setFieldsValue,resetFields }] = useForm({
-        labelWidth: 80,
-        schemas: formSchema,
-        showActionButtonGroup: false,
-      });
-
-      const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-        await resetFields();
-        setDrawerProps({ confirmLoading: false });
-        isUpdate.value = !!data?.isUpdate;
-        if (unref(isUpdate)) {
-          const config = data.record.config;
-          for (const key in config){
-            Reflect.set(data.record, key+'', config[key]);
-          }
-          await setFieldsValue({
-            ...data.record,
-          });
-        }
-      });
-
-      const getTitle = computed(() => (!unref(isUpdate) ? '新增设备' : '编辑设备'));
-
-      async function handleSubmit() {
-        try {
-          const values = await validate();
-          const { createMessage } = useMessage();
-          setDrawerProps({ confirmLoading: true });
-          let config={};
-          if(values.messageType === 'PHONE_MESSAGE'){
-            config ={
-              "accessKeyId":values.accessKeyId,
-              "accessKeySecret":values.accessKeySecret,
-            }
-          }else if(values.messageType === 'EMAIL_MESSAGE'){
-            config ={
-              "host":values.host,
-              "port":values.port,
-              "username":values.username,
-              "password":values.password,
-            }
-          }
-          Reflect.set(values, 'config', config);
-          let saveMessage = "添加成功";
-          let updateMessage = "修改成功";
-          await saveOrEditMessageConfig(values, unref(isUpdate));
-          closeDrawer();
-          emit('success');
-          createMessage.success(unref(isUpdate)?updateMessage:saveMessage);
-        } finally {
-          setDrawerProps({ confirmLoading: false });
-        }
-      }
-      async function customUpload({file}) {
-        if (beforeUpload(file)) {
-          const formData = new FormData()
-          formData.append('file', file)
-          const response = await upload(formData);
-          if (response.fileStaticUri) {
-            devicePic.value = response.fileStaticUri;
-          }
-        }
-      }
-
-      const beforeUpload = (file: FileItem) => {
-        const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
-        if (!isJpgOrPng) {
-          message.error('只能上传图片文件!');
-        }
-        const isLt2M = file.size as number / 1024 / 1024 < 2;
-        if (!isLt2M) {
-          message.error('图片大小不能超过2MB!');
-        }
-        return isJpgOrPng && isLt2M;
-      };
-      return {
-        registerDrawer,
-        registerForm,
-        getTitle,
-        handleSubmit,
-        beforeUpload,
-        customUpload,
-        devicePic
-      };
-    },
-  });
-</script>
-<style>
-.ant-upload-select-picture-card i {
-  font-size: 32px;
-  color: #999;
-}
-</style>

@@ -3,14 +3,14 @@
     v-bind="$attrs"
     width="55rem"
     @register="register"
-    :title=getTitle
+    :title="getTitle"
     @visible-change="handleVisibleChange"
+    @cancel="handleCancel"
   >
     <div class="step-form-form">
       <a-steps :current="current">
         <a-step title="填写设备信息" />
-        <a-step title="确认转账信息" />
-        <a-step title="完成" />
+        <a-step title="添加设备凭证" />
       </a-steps>
     </div>
     <div class="mt-5">
@@ -21,68 +21,35 @@
         v-show="current === 1"
         v-if="initStep2"
       />
-      <DeviceStep3 v-show="current === 2" @redo="handleRedo" v-if="initStep3" />
     </div>
   </BasicModal>
 </template>
 <script lang="ts">
-import {defineComponent, ref, nextTick, computed, unref, reactive, toRefs} from 'vue';
+  import { defineComponent, ref, nextTick, computed, unref, reactive, toRefs } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { BasicForm, FormSchema, useForm } from '/@/components/Form';
-  import DeviceStep1 from "/@/views/device/step/DeviceStep1.vue";
-  import DeviceStep2 from "/@/views/device/step/DeviceStep2.vue";
-  import DeviceStep3 from "/@/views/device/step/DeviceStep3.vue";
-  import { Steps } from "ant-design-vue";
-  const schemas: FormSchema[] = [
-    {
-      field: 'field1',
-      component: 'Input',
-      label: '字段1',
-      colProps: {
-        span: 24,
-      },
-      defaultValue: '111',
-    },
-    {
-      field: 'field2',
-      component: 'Input',
-      label: '字段2',
-      colProps: {
-        span: 24,
-      },
-    },
-  ];
+  import DeviceStep1 from '/@/views/device/step/DeviceStep1.vue';
+  import DeviceStep2 from '/@/views/device/step/DeviceStep2.vue';
+  import { Steps } from 'ant-design-vue';
   export default defineComponent({
-    name:'DeviceModal',
-    components: { BasicModal, BasicForm, DeviceStep1, DeviceStep2, DeviceStep3,
+    name: 'DeviceModal',
+    components: {
+      BasicModal,
+      DeviceStep1,
+      DeviceStep2,
       [Steps.name]: Steps,
-      [Steps.Step.name]: Steps.Step, },
+      [Steps.Step.name]: Steps.Step,
+    },
     props: {
       userData: { type: Object },
     },
     setup(props) {
       const state = reactive({
         initStep2: false,
-        initStep3: false,
       });
       const current = ref(0);
       const isUpdate = ref(true);
       const modelRef = ref({});
       const getTitle = computed(() => (!unref(isUpdate) ? '新增设备' : '编辑设备'));
-      const [
-        registerForm,
-        {
-          // setFieldsValue,
-          // setProps
-        },
-      ] = useForm({
-        labelWidth: 120,
-        schemas,
-        showActionButtonGroup: false,
-        actionColOptions: {
-          span: 24,
-        },
-      });
 
       const [register] = useModalInner((data) => {
         isUpdate.value = !!data?.isUpdate;
@@ -99,15 +66,15 @@ import {defineComponent, ref, nextTick, computed, unref, reactive, toRefs} from
       }
       function handleStep2Next(step2Values: any) {
         current.value++;
-        state.initStep3 = true;
         console.log(step2Values);
       }
       function handleRedo() {
         current.value = 0;
-        state.initSetp2 = false;
-        state.initSetp3 = false;
+        state.initStep2 = false;
+      }
+      function handleCancel() {
+        console.log('关闭了弹框');
       }
-
 
       function onDataReceive(data) {
         console.log('Data Received', data);
@@ -129,8 +96,19 @@ import {defineComponent, ref, nextTick, computed, unref, reactive, toRefs} from
         v && props.userData && nextTick(() => onDataReceive(props.userData));
       }
 
-      return { register, schemas, registerForm, model: modelRef, getTitle,handleVisibleChange,
-        current, ...toRefs(state), handleStepPrev, handleStep1Next, handleStep2Next, handleRedo};
+      return {
+        register,
+        model: modelRef,
+        getTitle,
+        handleVisibleChange,
+        current,
+        ...toRefs(state),
+        handleStepPrev,
+        handleStep1Next,
+        handleStep2Next,
+        handleCancel,
+        handleRedo,
+      };
     },
   });
 </script>

+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { findDictItemByCode } from '/@/api/system/dict';
+import { MessageEnum } from '/@/enums/messageEnum';
+import { DeviceTypeEnum, DeviceState } from '/@/api/device/model/deviceModel';
+// 表格列数据
+export const columns: BasicColumn[] = [
+  {
+    title: '设备名称',
+    dataIndex: 'name',
+    width: 200,
+  },
+  {
+    title: '设备类型',
+    dataIndex: 'deviceType',
+    width: 200,
+    slots: { customRender: 'deviceType' },
+  },
+  {
+    title: '设备配置',
+    dataIndex: 'deviceProfile.name',
+    width: 180,
+    slots: { customRender: 'deviceProfile' },
+  },
+  {
+    title: '标签',
+    dataIndex: 'label',
+    width: 180,
+  },
+  {
+    title: '配置信息',
+    dataIndex: 'deviceInfo',
+    width: 180,
+    slots: { customRender: 'config' },
+  },
+  {
+    title: '状态',
+    dataIndex: 'deviceState',
+    width: 120,
+    slots: { customRender: 'deviceState' },
+  },
+  {
+    title: '最后连接时间',
+    dataIndex: 'lastConnectTime',
+    width: 180,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 180,
+  },
+];
+
+// 查询字段
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'deviceType',
+    label: '设备类型',
+    component: 'Select',
+    componentProps: {
+      options: [
+        { label: '网关设备', value: DeviceTypeEnum.GATEWAY },
+        { label: '直连设备', value: DeviceTypeEnum.DIRECT_CONNECTION },
+        { label: '网关子设备', value: DeviceTypeEnum.SENSOR },
+      ],
+    },
+    colProps: { span: 4 },
+  },
+  {
+    field: 'deviceState',
+    label: '设备状态',
+    component: 'Select',
+    componentProps: {
+      options: [
+        { label: '待激活', value: DeviceState.INACTIVE },
+        { label: '在线', value: DeviceState.ONLINE },
+        { label: '离线', value: DeviceState.OFFLINE },
+      ],
+    },
+    colProps: { span: 4 },
+  },
+  {
+    field: 'name',
+    label: '设备名称',
+    component: 'Input',
+    colProps: { span: 8 },
+  },
+];
+
+// 弹框配置项
+export const formSchema: FormSchema[] = [
+  {
+    field: 'configName',
+    label: '配置名称',
+    required: true,
+    component: 'Input',
+  },
+  {
+    field: 'messageType',
+    label: '消息类型',
+    required: true,
+    component: 'ApiSelect',
+    componentProps: {
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'message_type',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+    },
+  },
+  {
+    field: 'platformType',
+    label: '平台类型',
+    required: true,
+    component: 'ApiSelect',
+    componentProps: {
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'platform_type',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+    },
+    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
+  },
+  {
+    field: 'accessKeyId',
+    label: 'accessKeyId',
+    required: true,
+    component: 'Input',
+    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
+  },
+  {
+    field: 'accessKeySecret',
+    label: 'accessKeySecret',
+    required: true,
+    component: 'Input',
+    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
+  },
+  {
+    field: 'host',
+    label: '服务器地址',
+    defaultValue: 'smtp.163.com',
+    required: true,
+    component: 'Input',
+    ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
+  },
+  {
+    field: 'port',
+    label: '端口',
+    defaultValue: 25,
+    required: true,
+    component: 'InputNumber',
+    ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
+  },
+  {
+    field: 'username',
+    label: '用户名',
+    required: true,
+    component: 'Input',
+    ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
+  },
+  {
+    field: 'password',
+    label: '密码',
+    required: true,
+    component: 'InputPassword',
+    ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
+  },
+  {
+    field: 'config',
+    label: '消息配置',
+    component: 'Input',
+    show: false,
+  },
+  {
+    field: 'id',
+    label: '主键',
+    component: 'Input',
+    show: false,
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'RadioButtonGroup',
+    defaultValue: 0,
+    componentProps: {
+      options: [
+        { label: '启用', value: 1 },
+        { label: '停用', value: 0 },
+      ],
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'InputTextArea',
+  },
+];
+
+export const isMessage = (type: string) => {
+  return type === MessageEnum.IS_SMS;
+};
+export const isEmail = (type: string) => {
+  return type === MessageEnum.IS_EMAIL;
+};

 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import {findDictItemByCode} from "/@/api/system/dict";
-import {DeviceTypeEnum,DeviceState} from "/@/api/device/model/deviceModel";
+import { findDictItemByCode } from '/@/api/system/dict';
+import { DeviceTypeEnum, DeviceState } from '/@/api/device/model/deviceModel';
 export const columns: BasicColumn[] = [
   {
     title: '设备名称',
@@ -12,7 +12,7 @@ export const columns: BasicColumn[] = [
     title: '设备类型',
     dataIndex: 'deviceType',
     width: 100,
-    slots:{customRender:'deviceType'},
+    slots: { customRender: 'deviceType' },
   },
   {
     title: '设备配置',
@@ -29,7 +29,7 @@ export const columns: BasicColumn[] = [
   {
     title: '标签',
     dataIndex: 'label',
-    width: 180
+    width: 180,
   },
   {
     title: '状态',
@@ -80,7 +80,6 @@ export const searchFormSchema: FormSchema[] = [
   },
 ];
 
-
 export const formSchema: FormSchema[] = [
   {
     field: 'icon',
@@ -92,10 +91,10 @@ export const formSchema: FormSchema[] = [
     field: 'name',
     label: '设备名称',
     required: true,
-    component:'Input',
-    componentProps:{
-      maxLength:30
-    }
+    component: 'Input',
+    componentProps: {
+      maxLength: 30,
+    },
   },
   {
     field: 'deviceType',
@@ -103,25 +102,25 @@ export const formSchema: FormSchema[] = [
     required: true,
     component: 'ApiSelect',
     componentProps: {
-      api:findDictItemByCode,
-      params:{
-        dictCode:"device_type"
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'device_type',
       },
-      labelField:'itemText',
-      valueField:'itemValue',
+      labelField: 'itemText',
+      valueField: 'itemValue',
     },
   },
   {
     field: 'label',
     label: '设备标签',
-    component:'Input',
-    componentProps:{
-      maxLength:255
-    }
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+    },
   },
   {
     label: '备注',
     field: 'remark',
     component: 'InputTextArea',
-  }
+  },
 ];

@@ -5,148 +5,171 @@
       <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新增设备 </a-button>
       </template>
-      <template #deviceProfile="{record}">
-        <a-button type="link" class="ml-2" @click="goDeviceProfile"> {{record.deviceProfile.name}} </a-button>
+      <template #deviceProfile="{ record }">
+        <a-button type="link" class="ml-2" @click="goDeviceProfile">
+          {{ record.deviceProfile.name }}
+        </a-button>
       </template>
-      <template #organizationId = "{record}">
-        {{record.organizationDTO.name}}
+      <template #organizationId="{ record }">
+        {{ record.organizationDTO.name }}
       </template>
-      <template #deviceType = "{record}">
+      <template #deviceType="{ record }">
         <Tag color="success" class="ml-2">
-          {{record.deviceType==DeviceTypeEnum.GATEWAY ?'网关设备':
-          record.deviceType==DeviceTypeEnum.DIRECT_CONNECTION  ?'直连设备':'网关子设备'}}
+          {{
+            record.deviceType === DeviceTypeEnum.GATEWAY
+              ? '网关设备'
+              : record.deviceType === DeviceTypeEnum.DIRECT_CONNECTION
+              ? '直连设备'
+              : '网关子设备'
+          }}
         </Tag>
       </template>
-      <template #deviceState = "{record}">
-        <Tag :color="record.deviceState==DeviceState.INACTIVE?'warning':record.deviceState==DeviceState.ONLINE?'success':'error'" class="ml-2">
-          {{record.deviceState==DeviceState.INACTIVE ?'待激活':
-          record.deviceState==DeviceState.ONLINE ?'在线':'离线'}}
+      <template #deviceState="{ record }">
+        <Tag
+          :color="
+            record.deviceState == DeviceState.INACTIVE
+              ? 'warning'
+              : record.deviceState == DeviceState.ONLINE
+              ? 'success'
+              : 'error'
+          "
+          class="ml-2"
+        >
+          {{
+            record.deviceState == DeviceState.INACTIVE
+              ? '待激活'
+              : record.deviceState == DeviceState.ONLINE
+              ? '在线'
+              : '离线'
+          }}
         </Tag>
       </template>
       <template #action="{ record }">
         <TableAction
           :actions="[
             {
-              label:'编辑',
+              label: '编辑',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
             },
             {
-              label:'删除',
+              label: '删除',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {
                 title: '是否确认删除',
                 confirm: handleDelete.bind(null, record),
-              }
+              },
             },
           ]"
         />
       </template>
     </BasicTable>
-    <ConfigDrawer @register="registerDrawer" @success="handleSuccess" />
-    <DeviceModal @register="registerModal" @success="handleSuccess"></DeviceModal>
+    <!-- <ConfigDrawer @register="registerDrawer" @success="handleSuccess" /> -->
+    <DeviceModal @register="registerModal" @success="handleSuccess" />
   </PageWrapper>
 </template>
 <script lang="ts">
-import {defineComponent, reactive,} from 'vue';
-  import { DeviceState, DeviceTypeEnum } from "/@/api/device/model/deviceModel";
+  import { defineComponent, reactive } from 'vue';
+  import { DeviceState, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useDrawer } from '/@/components/Drawer';
-  import ConfigDrawer from './DeviceDrawer.vue';
+  // import { useDrawer } from '/@/components/Drawer';
+  // import ConfigDrawer from './DeviceDrawer.vue';
   import { columns, searchFormSchema } from './device.data';
   import { Tag } from 'ant-design-vue';
-  import { CodeEditor } from '/@/components/CodeEditor';
-  import { useMessage } from "/@/hooks/web/useMessage";
-  import { deleteDevice, devicePage } from "/@/api/device/deviceManager";
-  import { PageEnum } from "/@/enums/pageEnum";
-  import { useGo } from "/@/hooks/web/usePage";
-  import { PageWrapper } from "/@/components/Page";
-  import OrganizationIdTree from "/@/views/common/OrganizationIdTree.vue";
-  import { useModal } from "/@/components/Modal";
-  import DeviceModal from "/@/views/device/DeviceModal.vue";
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { deleteDevice, devicePage } from '/@/api/device/deviceManager';
+  import { PageEnum } from '/@/enums/pageEnum';
+  import { useGo } from '/@/hooks/web/usePage';
+  import { PageWrapper } from '/@/components/Page';
+  import OrganizationIdTree from '/@/views/common/OrganizationIdTree.vue';
+  import { useModal } from '/@/components/Modal';
+  import DeviceModal from '/@/views/device/DeviceModal.vue';
 
+  export default defineComponent({
+    name: 'DeviceManagement',
+    components: {
+      BasicTable,
+      // ConfigDrawer,
+      PageWrapper,
+      TableAction,
+      OrganizationIdTree,
+      Tag,
+      DeviceModal,
+    },
+    setup() {
+      // const [registerDrawer, { openDrawer }] = useDrawer();
+      const { createMessage } = useMessage();
+      const go = useGo();
+      const searchInfo = reactive<Recordable>({});
+      const [registerModal, { openModal }] = useModal();
+      const [registerTable, { reload }] = useTable({
+        title: '设备列表',
+        api: devicePage,
+        columns,
+        formConfig: {
+          labelWidth: 120,
+          schemas: searchFormSchema,
+        },
+        useSearchForm: true,
+        showTableSetting: true,
+        bordered: true,
+        showIndexColumn: false,
+        searchInfo: searchInfo,
+        actionColumn: {
+          width: 180,
+          title: '操作',
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+          fixed: undefined,
+        },
+      });
 
-export default defineComponent({
-  name: 'DeviceManagement',
-  components: { BasicTable, ConfigDrawer,PageWrapper, TableAction ,OrganizationIdTree,CodeEditor,Tag,
-    DeviceModal},
-  setup() {
-    const [registerDrawer, { openDrawer }] = useDrawer();
-    const {createMessage} = useMessage();
-    const go = useGo();
-    const searchInfo = reactive<Recordable>({});
-    const [registerModal, { openModal }] = useModal();
-    const [registerTable, { reload }] = useTable({
-      title: '设备列表',
-      api: devicePage,
-      columns,
-      formConfig: {
-        labelWidth: 120,
-        schemas: searchFormSchema,
-      },
-      useSearchForm: true,
-      showTableSetting: true,
-      bordered: true,
-      showIndexColumn: false,
-      searchInfo:searchInfo,
-      actionColumn: {
-        width: 180,
-        title: '操作',
-        dataIndex: 'action',
-        slots: { customRender: 'action' },
-        fixed: undefined,
-      },
-    });
-
-    function handleCreate() {
-      // openDrawer(true, {
-      //   isUpdate: false,
-      // });
-      openModal(true,{
-        isUpdate: false,
-      })
-    }
+      function handleCreate() {
+        openModal(true, {
+          isUpdate: false,
+        });
+      }
 
-    function handleEdit(record: Recordable) {
-      openDrawer(true, {
-        record,
-        isUpdate: true,
-      });
-    }
+      function handleEdit(record: Recordable) {
+        openModal(true, {
+          isUpdate: true,
+          record,
+        });
+      }
 
-    function handleDelete(record: Recordable) {
-      let ids = [record.id];
-      deleteDevice(ids).then(()=>{
-        createMessage.success("删除设备成功")
-        handleSuccess()
-      });
-    }
+      function handleDelete(record: Recordable) {
+        let ids = [record.id];
+        deleteDevice(ids).then(() => {
+          createMessage.success('删除设备成功');
+          handleSuccess();
+        });
+      }
 
-    function handleSuccess() {
-      reload();
-    }
-    function handleSelect(organization) {
-      searchInfo.organizationId = organization;
-      handleSuccess();
-    }
-    function goDeviceProfile(){
-      go(PageEnum.DEVICE_PROFILE)
-    }
-    return {
-      registerTable,
-      registerDrawer,
-      handleCreate,
-      handleEdit,
-      handleDelete,
-      handleSuccess,
-      goDeviceProfile,
-      DeviceTypeEnum,
-      DeviceState,
-      handleSelect,
-      searchInfo,
-      registerModal
-    };
-  },
-});
+      function handleSuccess() {
+        reload();
+      }
+      function handleSelect(organization) {
+        searchInfo.organizationId = organization;
+        handleSuccess();
+      }
+      function goDeviceProfile() {
+        go(PageEnum.DEVICE_PROFILE);
+      }
+      return {
+        registerTable,
+        // registerDrawer,
+        handleCreate,
+        handleEdit,
+        handleDelete,
+        handleSuccess,
+        goDeviceProfile,
+        DeviceTypeEnum,
+        DeviceState,
+        handleSelect,
+        searchInfo,
+        registerModal,
+      };
+    },
+  });
 </script>

@@ -7,7 +7,7 @@
     width="500px"
     @ok="handleSubmit"
   >
-    <BasicForm @register="registerForm"/>
+    <BasicForm @register="registerForm" />
   </BasicDrawer>
 </template>
 <script lang="ts">
@@ -15,8 +15,8 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema } from './device.profile.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import {saveOrEditMessageConfig} from "/@/api/message/config";
-  import {useMessage} from "/@/hooks/web/useMessage";
+  import { saveOrEditMessageConfig } from '/@/api/message/config';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
   export default defineComponent({
     name: 'DeviceProfileDrawer',
@@ -25,7 +25,7 @@
     setup(_, { emit }) {
       const isUpdate = ref(true);
 
-      const [registerForm, {  validate,setFieldsValue,resetFields }] = useForm({
+      const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
         labelWidth: 120,
         schemas: formSchema,
         showActionButtonGroup: false,
@@ -37,8 +37,8 @@
         isUpdate.value = !!data?.isUpdate;
         if (unref(isUpdate)) {
           const config = data.record.config;
-          for (const key in config){
-            Reflect.set(data.record, key+'', config[key]);
+          for (const key in config) {
+            Reflect.set(data.record, key + '', config[key]);
           }
           await setFieldsValue({
             ...data.record,
@@ -53,27 +53,27 @@
           const values = await validate();
           const { createMessage } = useMessage();
           setDrawerProps({ confirmLoading: true });
-          let config={};
-          if(values.messageType === 'PHONE_MESSAGE'){
-            config ={
-              "accessKeyId":values.accessKeyId,
-              "accessKeySecret":values.accessKeySecret,
-            }
-          }else if(values.messageType === 'EMAIL_MESSAGE'){
-            config ={
-              "host":values.host,
-              "port":values.port,
-              "username":values.username,
-              "password":values.password,
-            }
+          let config = {};
+          if (values.messageType === 'PHONE_MESSAGE') {
+            config = {
+              accessKeyId: values.accessKeyId,
+              accessKeySecret: values.accessKeySecret,
+            };
+          } else if (values.messageType === 'EMAIL_MESSAGE') {
+            config = {
+              host: values.host,
+              port: values.port,
+              username: values.username,
+              password: values.password,
+            };
           }
           Reflect.set(values, 'config', config);
-          let saveMessage = "添加成功";
-          let updateMessage = "修改成功";
+          let saveMessage = '添加成功';
+          let updateMessage = '修改成功';
           await saveOrEditMessageConfig(values, unref(isUpdate));
           closeDrawer();
           emit('success');
-          createMessage.success(unref(isUpdate)?updateMessage:saveMessage);
+          createMessage.success(unref(isUpdate) ? updateMessage : saveMessage);
         } finally {
           setDrawerProps({ confirmLoading: false });
         }

 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import {findDictItemByCode} from "/@/api/system/dict";
-import {MessageEnum} from "/@/enums/messageEnum";
+import { findDictItemByCode } from '/@/api/system/dict';
+import { MessageEnum } from '/@/enums/messageEnum';
 export const columns: BasicColumn[] = [
   {
     title: '配置名称',
@@ -34,20 +34,19 @@ export const searchFormSchema: FormSchema[] = [
   },
 ];
 
-
-export const isMessage = (type:string)=>{
-  return type===MessageEnum.IS_SMS;
-}
-export const isEmail = (type:string)=>{
-  return type===MessageEnum.IS_EMAIL;
-}
+export const isMessage = (type: string) => {
+  return type === MessageEnum.IS_SMS;
+};
+export const isEmail = (type: string) => {
+  return type === MessageEnum.IS_EMAIL;
+};
 
 export const formSchema: FormSchema[] = [
   {
     field: 'configName',
     label: '配置名称',
     required: true,
-    component:'Input'
+    component: 'Input',
   },
   {
     field: 'messageType',
@@ -55,12 +54,12 @@ export const formSchema: FormSchema[] = [
     required: true,
     component: 'ApiSelect',
     componentProps: {
-      api:findDictItemByCode,
-      params:{
-        dictCode:"message_type"
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'message_type',
       },
-      labelField:'itemText',
-      valueField:'itemValue',
+      labelField: 'itemText',
+      valueField: 'itemValue',
     },
   },
   {
@@ -69,70 +68,70 @@ export const formSchema: FormSchema[] = [
     required: true,
     component: 'ApiSelect',
     componentProps: {
-      api:findDictItemByCode,
-      params:{
-        dictCode:"platform_type"
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'platform_type',
       },
-      labelField:'itemText',
-      valueField:'itemValue',
+      labelField: 'itemText',
+      valueField: 'itemValue',
     },
-    ifShow:({values}) => isMessage(Reflect.get(values,'messageType')),
+    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
   {
     field: 'accessKeyId',
     label: 'accessKeyId',
     required: true,
-    component:'Input',
-    ifShow:({values}) => isMessage(Reflect.get(values,'messageType')),
+    component: 'Input',
+    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
   {
     field: 'accessKeySecret',
     label: 'accessKeySecret',
     required: true,
-    component:'Input',
-    ifShow:({values}) => isMessage(Reflect.get(values,'messageType')),
+    component: 'Input',
+    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
   {
     field: 'host',
     label: '服务器地址',
-    defaultValue:'smtp.163.com',
+    defaultValue: 'smtp.163.com',
     required: true,
-    component:'Input',
-    ifShow:({values}) => isEmail(Reflect.get(values,'messageType')),
+    component: 'Input',
+    ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
   },
   {
     field: 'port',
     label: '端口',
     defaultValue: 25,
     required: true,
-    component:'InputNumber',
-    ifShow:({values}) => isEmail(Reflect.get(values,'messageType')),
+    component: 'InputNumber',
+    ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
   },
   {
     field: 'username',
     label: '用户名',
     required: true,
-    component:'Input',
-    ifShow:({values}) => isEmail(Reflect.get(values,'messageType')),
+    component: 'Input',
+    ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
   },
   {
     field: 'password',
     label: '密码',
     required: true,
-    component:'InputPassword',
-    ifShow:({values}) => isEmail(Reflect.get(values,'messageType')),
+    component: 'InputPassword',
+    ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
   },
   {
     field: 'config',
     label: '消息配置',
-    component:'Input',
-    show:false,
+    component: 'Input',
+    show: false,
   },
   {
     field: 'id',
     label: '主键',
-    component:'Input',
-    show:false,
+    component: 'Input',
+    show: false,
   },
   {
     field: 'status',
@@ -150,5 +149,5 @@ export const formSchema: FormSchema[] = [
     label: '备注',
     field: 'remark',
     component: 'InputTextArea',
-  }
+  },
 ];

@@ -8,18 +8,18 @@
         <TableAction
           :actions="[
             {
-              label:'编辑',
+              label: '编辑',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
             },
             {
-              label:'删除',
+              label: '删除',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {
                 title: '是否确认删除',
                 confirm: handleDelete.bind(null, record),
-              }
+              },
             },
           ]"
         />
@@ -29,71 +29,71 @@
   </div>
 </template>
 <script lang="ts">
-import { defineComponent} from 'vue';
-import { BasicTable, useTable, TableAction } from '/@/components/Table';
-import { useDrawer } from '/@/components/Drawer';
-import DeviceProfileDrawer from './DeviceProfile.vue';
-import { columns, searchFormSchema } from './device.profile.data';
-import {useMessage} from "/@/hooks/web/useMessage";
-import {deviceProfilePage,deleteDeviceProfile} from "/@/api/device/deviceManager";
-export default defineComponent({
-  name: 'DeviceProfileManagement',
-  components: { BasicTable, DeviceProfileDrawer, TableAction},
-  setup() {
-    const [registerDrawer, { openDrawer }] = useDrawer();
-    const {createMessage} = useMessage();
-    const [registerTable, { reload }] = useTable({
-      title: '设备配置列表',
-      api: deviceProfilePage,
-      columns,
-      formConfig: {
-        labelWidth: 120,
-        schemas: searchFormSchema,
-      },
-      useSearchForm: true,
-      showTableSetting: true,
-      bordered: true,
-      showIndexColumn: false,
-      actionColumn: {
-        width: 180,
-        title: '操作',
-        dataIndex: 'action',
-        slots: { customRender: 'action' },
-      },
-    });
-
-    function handleCreate() {
-      openDrawer(true, {
-        isUpdate: false,
+  import { defineComponent } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useDrawer } from '/@/components/Drawer';
+  import DeviceProfileDrawer from './DeviceProfile.vue';
+  import { columns, searchFormSchema } from './device.profile.data';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { deviceProfilePage, deleteDeviceProfile } from '/@/api/device/deviceManager';
+  export default defineComponent({
+    name: 'DeviceProfileManagement',
+    components: { BasicTable, DeviceProfileDrawer, TableAction },
+    setup() {
+      const [registerDrawer, { openDrawer }] = useDrawer();
+      const { createMessage } = useMessage();
+      const [registerTable, { reload }] = useTable({
+        title: '设备配置列表',
+        api: deviceProfilePage,
+        columns,
+        formConfig: {
+          labelWidth: 120,
+          schemas: searchFormSchema,
+        },
+        useSearchForm: true,
+        showTableSetting: true,
+        bordered: true,
+        showIndexColumn: false,
+        actionColumn: {
+          width: 180,
+          title: '操作',
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+        },
       });
-    }
 
-    function handleEdit(record: Recordable) {
-      openDrawer(true, {
-        record,
-        isUpdate: true,
-      });
-    }
+      function handleCreate() {
+        openDrawer(true, {
+          isUpdate: false,
+        });
+      }
 
-    function handleDelete(record: Recordable) {
-      let ids = [record.id];
-      deleteDeviceProfile(ids).then(()=>{
-        createMessage.success("删除设备配置成功")
-        handleSuccess()
-      });
-    }
+      function handleEdit(record: Recordable) {
+        openDrawer(true, {
+          record,
+          isUpdate: true,
+        });
+      }
+
+      function handleDelete(record: Recordable) {
+        let ids = [record.id];
+        deleteDeviceProfile(ids).then(() => {
+          createMessage.success('删除设备配置成功');
+          handleSuccess();
+        });
+      }
 
-    function handleSuccess() {
-      reload();
-    }
-    return {
-      registerTable,
-      registerDrawer,
-      handleCreate,
-      handleEdit,
-      handleDelete,
-      handleSuccess,
-    };
-  },
-});
+      function handleSuccess() {
+        reload();
+      }
+      return {
+        registerTable,
+        registerDrawer,
+        handleCreate,
+        handleEdit,
+        handleDelete,
+        handleSuccess,
+      };
+    },
+  });
 </script>

@@ -11,38 +11,79 @@
             :customRequest="customUpload"
             :before-upload="beforeUpload"
           >
-            <img v-if="devicePic" :src="devicePic" alt="avatar"/>
+            <img v-if="devicePic" :src="devicePic" alt="avatar" />
             <div v-else>
-              <loading-outlined v-if="loading"></loading-outlined>
-              <plus-outlined v-else></plus-outlined>
+              <!-- <LoadingOutlined v-if="loading" /> -->
+              <PlusOutlined />
               <div class="ant-upload-text">图片上传</div>
             </div>
           </Upload>
         </template>
+        <template #devicePosition>
+          <Input disabled v-model:value="positionState.address">
+            <template #addonAfter>
+              <EnvironmentTwoTone @click="selectPosition" />
+            </template>
+          </Input>
+        </template>
       </BasicForm>
     </div>
+    <Modal v-model:visible="visible" title="设备位置" @ok="handleOk" width="800px">
+      <div>
+        <a-form :label-col="labelCol">
+          <a-row :gutter="20">
+            <a-col :span="8">
+              <a-form-item label="经度">
+                <Input type="input" v-model:value="positionState.lng" disabled />
+              </a-form-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-item label="纬度">
+                <Input type="input" v-model:value="positionState.lat" disabled />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+        <div ref="wrapRef" style="height: 300px; width: 90%" class="ml-6"></div>
+      </div>
+    </Modal>
   </div>
 </template>
 <script lang="ts">
-import {defineComponent, ref} from 'vue';
+  import { defineComponent, ref, nextTick, unref, reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { step1Schemas } from './data';
-  import {Select, Input, Divider, Upload, message} from 'ant-design-vue';
-  import {upload} from "/@/api/oss/ossFileUploader";
-  import {FileItem} from "/@/components/Upload/src/typing";
+  import { useScript } from '/@/hooks/web/useScript';
+  import { ScrollActionType } from '/@/components/Container/index';
+  import { Input, Divider, Upload, message, Modal, Form, Row, Col } from 'ant-design-vue';
+  import { EnvironmentTwoTone, LoadingOutlined, PlusOutlined } from '@ant-design/icons-vue';
+  import { upload } from '/@/api/oss/ossFileUploader';
+  import { FileItem } from '/@/components/Upload/src/typing';
+
   export default defineComponent({
     components: {
       BasicForm,
-      [Select.name]: Select,
-      ASelectOption: Select.Option,
-      [Input.name]: Input,
+      Input,
       [Input.Group.name]: Input.Group,
       [Divider.name]: Divider,
-      Upload
+      Upload,
+      EnvironmentTwoTone,
+      // LoadingOutlined,
+      PlusOutlined,
+      Modal,
+      [Form.name]: Form,
+      [Form.Item.name]: Form.Item,
+      [Row.name]: Row,
+      [Col.name]: Col,
     },
     emits: ['next'],
     setup(_, { emit }) {
-      const devicePic = ref("");
+      const devicePic = ref('');
+      const positionState = reactive({
+        lng: '',
+        lat: '',
+        address: '',
+      });
       const [register, { validate }] = useForm({
         labelWidth: 100,
         schemas: step1Schemas,
@@ -58,34 +99,91 @@ import {defineComponent, ref} from 'vue';
 
       async function customSubmitFunc() {
         try {
-          const values = await validate();
+          let values = await validate();
+          values = { devicePic: devicePic.value, ...positionState, ...values };
+          delete values.icon;
+          delete values.devicePosition;
           emit('next', values);
+          // 获取输入的数据
         } catch (error) {}
       }
-      async function customUpload({file}) {
+      // 图片上传
+      async function customUpload({ file }) {
         if (beforeUpload(file)) {
-          const formData = new FormData()
-          formData.append('file', file)
+          const formData = new FormData();
+          formData.append('file', file);
           const response = await upload(formData);
           if (response.fileStaticUri) {
             devicePic.value = response.fileStaticUri;
           }
         }
       }
-
       const beforeUpload = (file: FileItem) => {
         const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
         if (!isJpgOrPng) {
           message.error('只能上传图片文件!');
         }
-        const isLt2M = file.size as number / 1024 / 1024 < 2;
+        const isLt2M = (file.size as number) / 1024 / 1024 < 2;
         if (!isLt2M) {
           message.error('图片大小不能超过2MB!');
         }
         return isJpgOrPng && isLt2M;
       };
 
-      return { register, beforeUpload, customUpload, devicePic };
+      // 地图的弹框
+      const visible = ref(false);
+      const selectPosition = () => {
+        visible.value = true;
+        initMap();
+      };
+
+      // 地图
+      const BAI_DU_MAP_URL =
+        'https://api.map.baidu.com/getscript?v=3.0&ak=7uOPPyAHn2Y2ZryeQqHtcRqtIY374vKa';
+      const wrapRef = ref<HTMLDivElement | null>(null);
+      const scrollRef = ref<Nullable<ScrollActionType>>(null);
+      const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
+      async function initMap() {
+        await toPromise();
+        await nextTick();
+        const wrapEl = unref(wrapRef);
+        const BMap = (window as any).BMap;
+        if (!wrapEl) return;
+        const map = new BMap.Map(wrapEl);
+        map.addEventListener('click', () => {
+          const { lat, lng } = map.he;
+          positionState.lat = lat + '';
+          positionState.lng = lng + '';
+          let gc = new BMap.Geocoder();
+          let newPoint = new BMap.Point(lng, lat);
+          gc.getLocation(newPoint, (rs) => {
+            let addComp = rs.addressComponents;
+            //获取详细的地址，精确到街道的名称
+            let addrname = addComp.city + addComp.district + addComp.street + addComp.streetNumber;
+            positionState.address = addrname;
+          });
+        });
+        const point = new BMap.Point(104.04813399999999, 30.54348986021446);
+        map.centerAndZoom(point, 15);
+        map.enableScrollWheelZoom(true);
+      }
+      // 确定选择的位置
+      const handleOk = () => {
+        visible.value = false;
+      };
+      return {
+        positionState,
+        register,
+        beforeUpload,
+        customUpload,
+        selectPosition,
+        devicePic,
+        visible,
+        scrollRef,
+        handleOk,
+        wrapRef,
+        labelCol: { style: { width: '40px' } },
+      };
     },
   });
 </script>

 <template>
   <div class="step2">
-    <a-alert message="确认转账后，资金将直接打入对方账户，无法退回。" show-icon />
-    <a-descriptions :column="1" class="mt-5">
-      <a-descriptions-item label="付款账户"> ant-design@alipay.com </a-descriptions-item>
-      <a-descriptions-item label="收款账户"> test@example.com </a-descriptions-item>
-      <a-descriptions-item label="收款人姓名"> Vben </a-descriptions-item>
-      <a-descriptions-item label="转账金额"> 500元 </a-descriptions-item>
-    </a-descriptions>
-    <a-divider />
-    <BasicForm @register="register" />
+    <div><input type="checkbox" v-model="isCreaentials" @click="checked" /> 添加凭证 </div>
+
+    <a-form :label-col="labelCol" :wrapper-col="wrapperCol" v-if="isCreaentials">
+      <a-form-item label="凭据类型">
+        <a-select
+          v-model:value="creaentialsType"
+          style="width: 200px"
+          @change="handleChange"
+          placeholder="请选择凭据类型"
+          :options="options"
+        />
+      </a-form-item>
+      <div v-if="creaentialsType === 'Access token'">
+        <a-form-item label="访问令牌">
+          <a-input type="input" style="width: 200px" v-model:value="token" />
+        </a-form-item>
+      </div>
+      <div v-else-if="creaentialsType === 'X.509'">
+        <a-form-item label="RSA公钥">
+          <a-input type="input" style="width: 200px" v-model:value="publicKey" />
+        </a-form-item>
+      </div>
+      <div v-else>
+        <a-form-item label="客户端ID">
+          <a-input type="input" style="width: 200px" v-model:value="clientId" />
+        </a-form-item>
+        <a-form-item label="用户名">
+          <a-input type="input" style="width: 200px" v-model:value="username" />
+        </a-form-item>
+        <a-form-item label="密码">
+          <a-input type="password" style="width: 200px" v-model:value="password" />
+        </a-form-item>
+      </div>
+    </a-form>
+
+    <div class="flex justify-start">
+      <a-button class="mr-5" @click="prevStep">上一步</a-button>
+    </div>
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form';
-  import { step2Schemas } from './data';
-  import { Alert, Divider, Descriptions } from 'ant-design-vue';
+  import { defineComponent, reactive, ref, toRefs } from 'vue';
 
+  import { Input, Form, Select, Button, SelectProps } from 'ant-design-vue';
   export default defineComponent({
     components: {
-      BasicForm,
-      [Alert.name]: Alert,
-      [Divider.name]: Divider,
-      [Descriptions.name]: Descriptions,
-      [Descriptions.Item.name]: Descriptions.Item,
+      [Form.name]: Form,
+      [Form.Item.name]: Form.Item,
+      [Input.name]: Input,
+      [Select.name]: Select,
+      [Button.name]: Button,
     },
-    emits: ['next', 'prev'],
+    emits: ['prev'],
     setup(_, { emit }) {
-      const [register, { validate, setProps }] = useForm({
-        labelWidth: 80,
-        schemas: step2Schemas,
-        actionColOptions: {
-          span: 14,
+      const isCreaentials = ref(false);
+      const creaentialsType = ref('Access token');
+      const creaentialsPassword = reactive({
+        token: '',
+        publicKey: '',
+        clientId: '',
+        username: '',
+        password: '',
+      });
+      const options = ref<SelectProps['options']>([
+        {
+          value: 'Access token',
+          label: 'Access token',
         },
-        resetButtonOptions: {
-          text: '上一步',
+
+        {
+          value: 'X.509',
+          label: 'X.509',
         },
-        submitButtonOptions: {
-          text: '提交',
+        {
+          value: 'MQTT Basic',
+          label: 'MQTT Basic',
         },
-        resetFunc: customResetFunc,
-        submitFunc: customSubmitFunc,
-      });
-
-      async function customResetFunc() {
+      ]);
+      const checked = () => {
+        isCreaentials.value = !isCreaentials.value;
+      };
+      const prevStep = () => {
         emit('prev');
-      }
-
-      async function customSubmitFunc() {
-        try {
-          const values = await validate();
-          setProps({
-            submitButtonOptions: {
-              loading: true,
-            },
-          });
-          setTimeout(() => {
-            setProps({
-              submitButtonOptions: {
-                loading: false,
-              },
-            });
-            emit('next', values);
-          }, 1500);
-        } catch (error) {}
-      }
-
-      return { register };
+      };
+      // 切换凭证类型时，重置字段
+      const handleChange = (value) => {
+        if (value === 'Access token') {
+          creaentialsPassword.token = '';
+        } else if (value === 'X.509') {
+          creaentialsPassword.publicKey = '';
+        } else {
+          creaentialsPassword.clientId = '';
+          creaentialsPassword.username = '';
+          creaentialsPassword.password = '';
+        }
+      };
+      return {
+        ...toRefs(creaentialsPassword),
+        creaentialsType,
+        isCreaentials,
+        options,
+        handleChange,
+        prevStep,
+        checked,
+        labelCol: { style: { width: '150px' } },
+        wrapperCol: { span: 18 },
+      };
     },
   });
 </script>
 <style lang="less" scoped>
   .step2 {
-    width: 450px;
+    width: 500px;
     margin: 0 auto;
   }
 </style>

-<template>
-  <div class="step3">
-    <a-result status="success" title="操作成功" sub-title="预计两小时内到账">
-      <template #extra>
-        <a-button type="primary" @click="redo"> 再转一笔 </a-button>
-        <a-button> 查看账单 </a-button>
-      </template>
-    </a-result>
-    <div class="desc-wrap">
-      <a-descriptions :column="1" class="mt-5">
-        <a-descriptions-item label="付款账户"> ant-design@alipay.com </a-descriptions-item>
-        <a-descriptions-item label="收款账户"> test@example.com </a-descriptions-item>
-        <a-descriptions-item label="收款人姓名"> Vben </a-descriptions-item>
-        <a-descriptions-item label="转账金额"> 500元 </a-descriptions-item>
-      </a-descriptions>
-    </div>
-  </div>
-</template>
-<script lang="ts">
-  import { defineComponent } from 'vue';
-  import { Result, Descriptions } from 'ant-design-vue';
-  export default defineComponent({
-    components: {
-      [Result.name]: Result,
-      [Descriptions.name]: Descriptions,
-      [Descriptions.Item.name]: Descriptions.Item,
-    },
-    emits: ['redo'],
-    setup(_, { emit }) {
-      return {
-        redo: () => {
-          emit('redo');
-        },
-      };
-    },
-  });
-</script>
-<style lang="less" scoped>
-  .step3 {
-    width: 600px;
-    margin: 0 auto;
-  }
-
-  .desc-wrap {
-    padding: 24px 40px;
-    margin-top: 24px;
-    background-color: @background-color-light;
-  }
-</style>

@@ -20,7 +20,6 @@
         v-show="current === 1"
         v-if="initSetp2"
       />
-      <Step3 v-show="current === 2" @redo="handleRedo" v-if="initSetp3" />
     </div>
   </PageWrapper>
 </template>
@@ -28,7 +27,6 @@
   import { defineComponent, ref, reactive, toRefs } from 'vue';
   import Step1 from './DeviceStep1.vue';
   import Step2 from './DeviceStep2.vue';
-  import Step3 from './DeviceStep3.vue';
   import { PageWrapper } from '/@/components/Page';
   import { Steps } from 'ant-design-vue';
 
@@ -37,17 +35,16 @@
     components: {
       Step1,
       Step2,
-      Step3,
+
       PageWrapper,
       [Steps.name]: Steps,
       [Steps.Step.name]: Steps.Step,
     },
     setup() {
-      const current = ref(0);
+      const current = ref(1);
 
       const state = reactive({
         initSetp2: false,
-        initSetp3: false,
       });
 
       function handleStep1Next(step1Values: any) {
@@ -62,14 +59,12 @@
 
       function handleStep2Next(step2Values: any) {
         current.value++;
-        state.initSetp3 = true;
         console.log(step2Values);
       }
 
       function handleRedo() {
         current.value = 0;
         state.initSetp2 = false;
-        state.initSetp3 = false;
       }
 
       return {

 import { FormSchema } from '/@/components/Form';
-import {findDictItemByCode} from "/@/api/system/dict";
+import { findDictItemByCode } from '/@/api/system/dict';
 
 export const step1Schemas: FormSchema[] = [
   {
@@ -12,10 +12,10 @@ export const step1Schemas: FormSchema[] = [
     field: 'name',
     label: '设备名称',
     required: true,
-    component:'Input',
-    componentProps:{
-      maxLength:30
-    }
+    component: 'Input',
+    componentProps: {
+      maxLength: 30,
+    },
   },
   {
     field: 'deviceType',
@@ -23,35 +23,31 @@ export const step1Schemas: FormSchema[] = [
     required: true,
     component: 'ApiSelect',
     componentProps: {
-      api:findDictItemByCode,
-      params:{
-        dictCode:"device_type"
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'device_type',
       },
-      labelField:'itemText',
-      valueField:'itemValue',
+      labelField: 'itemText',
+      valueField: 'itemValue',
     },
   },
   {
     field: 'label',
     label: '设备标签',
-    component:'Input',
-    componentProps:{
-      maxLength:255
-    }
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+    },
+  },
+  {
+    field: 'devicePosition',
+    label: '设备位置',
+    component: 'Input',
+    slot: 'devicePosition',
   },
   {
     label: '备注',
     field: 'remark',
     component: 'InputTextArea',
-  }
-];
-
-export const step2Schemas: FormSchema[] = [
-  {
-    field: 'pwd',
-    component: 'InputPassword',
-    label: '支付密码',
-    required: true,
-    defaultValue: '123456',
   },
 ];