'告警联系人页面开发'

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

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

@@ -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",

 import { defHttp } from '/@/utils/http/axios';
-import type { BasicPageParams } from '/@/api/model/baseModel';
-import type { ContactModal, ContactParams } from './modal/alarmContactModel';
+import type {
+  ContactPageParams,
+  ContactModal,
+  ContactParams,
+  ContactInfo,
+} from './model/alarmContactModal';
 import { getPageData } from '../../base';
 enum Api {
   alarmContact = '/alarmContact',
@@ -8,7 +12,7 @@ enum Api {
 }
 
 // 获取
-export const getAlarmContact = (params: BasicPageParams) => {
+export const getAlarmContact = (params: ContactPageParams) => {
   return getPageData<ContactModal>(params, Api.alarmContact);
 };
 
@@ -16,9 +20,7 @@ export const getAlarmContact = (params: BasicPageParams) => {
 export const addAlarmContact = (params: ContactParams) => {
   return defHttp.post({
     url: Api.alarmContact,
-    data: {
-      params,
-    },
+    data: params,
   });
 };
 
@@ -26,9 +28,7 @@ export const addAlarmContact = (params: ContactParams) => {
 export const updateAlarmContact = (params: ContactParams) => {
   return defHttp.post({
     url: Api.updateAlarmContact,
-    data: {
-      params,
-    },
+    data: params,
   });
 };
 
@@ -39,3 +39,9 @@ export const deleteAlarmContact = (ids: string[]) => {
     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;
@@ -6,6 +8,7 @@ interface ContactItemsModal {
   department: string;
   phone: string;
 }
+export type ContactPageParams = BasicPageParams & { username: string; organizationId: string };
 
 export interface ContactModal {
   items: ContactItemsModal[];
@@ -17,8 +20,9 @@ export interface ContactParams {
   username: string;
   department?: string;
   email?: string;
-  enabled?: boolean;
   wechat?: string;
   addPeople?: string;
   remark?: string;
 }
+
+export type ContactInfo = ContactParams;

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

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

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

-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 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!',

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

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

 /* 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 in 10" :key="item">
+              <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 [registerForm] = useForm({
+        labelWidth: 90,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+      });
+      const handleReset = () => {
+        deviceValue.value = '';
+      };
+      return { wrapRef, registerForm, deviceValue, deviceStatus, handleReset, scrollRef, current };
+    },
+  });
+</script>
+
+<style scoped>
+  .wrapper {
+    position: relative;
+  }
+  .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>

@@ -4,7 +4,7 @@
     @register="registerDrawer"
     showFooter
     :title="getTitle"
-    width="500px"
+    width="30%"
     @ok="handleSubmit"
   >
     <BasicForm @register="registerForm" />
@@ -15,7 +15,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { saveOrEditMessageConfig } from '/@/api/message/config';
+  import { saveOrEditAlarmContact } from '/@/api/alarm/contact/alarmContact';
   import { useMessage } from '/@/hooks/web/useMessage';
 
   export default defineComponent({
@@ -36,41 +36,22 @@
         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) ? '新增消息配置' : '编辑消息配置'));
+      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));
+          await saveOrEditAlarmContact(values, unref(isUpdate));
           closeDrawer();
           emit('success');
           createMessage.success(unref(isUpdate) ? updateMessage : saveMessage);
@@ -80,9 +61,9 @@
       }
 
       return {
+        getTitle,
         registerDrawer,
         registerForm,
-        getTitle,
         handleSubmit,
       };
     },

 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import { findDictItemByCode } from '/@/api/system/dict';
-import { MessageEnum } from '/@/enums/messageEnum';
+import { getOrganizationList } from '/@/api/system/system';
 // 表格列数据
 export const columns: BasicColumn[] = [
   {
     title: '姓名',
     dataIndex: 'username',
-    width: 100,
+    width: 120,
   },
   {
     title: '所属组织',
-    dataIndex: 'department',
-    width: 200,
+    dataIndex: 'organizationId',
+    width: 160,
   },
   {
     title: '手机',
@@ -21,32 +20,32 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '邮箱',
-    dataIndex: 'label',
+    dataIndex: 'email',
     width: 160,
   },
   {
     title: '微信',
-    dataIndex: 'deviceInfo',
+    dataIndex: 'wechat',
     width: 180,
   },
   {
     title: '备注',
-    dataIndex: 'deviceState',
+    dataIndex: 'remark',
     width: 120,
   },
   {
     title: '添加人',
-    dataIndex: 'lastConnectTime',
+    dataIndex: 'addPeople',
     width: 180,
   },
   {
-    title: '更新时间',
-    dataIndex: 'updateTime',
+    title: '添加时间',
+    dataIndex: 'createTime',
     width: 180,
   },
   {
-    title: '添加时间',
-    dataIndex: 'createTime',
+    title: '更新时间',
+    dataIndex: 'updateTime',
     width: 180,
   },
 ];
@@ -54,21 +53,12 @@ export const columns: BasicColumn[] = [
 // 查询字段
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'department',
-    label: '所属组织',
-    component: 'TreeSelect',
-    componentProps: {
-      placeholder: '请选择组织',
-    },
-    colProps: { span: 6 },
-  },
-  {
     field: 'username',
-    label: '用户名',
+    label: '联系人姓名',
     component: 'Input',
     colProps: { span: 6 },
     componentProps: {
-      placeholder: '请输入姓名、手机号或邮箱',
+      placeholder: '请输入联系人姓名',
     },
   },
 ];
@@ -76,117 +66,93 @@ export const searchFormSchema: FormSchema[] = [
 // 弹框配置项
 export const formSchema: FormSchema[] = [
   {
-    field: 'configName',
+    field: 'username',
     label: '联系人姓名',
     required: true,
     component: 'Input',
+    componentProps: {
+      placeholder: '请输入联系人姓名',
+    },
   },
   {
-    field: 'messageType',
+    field: 'organizationId',
     label: '所属组织',
-    required: true,
-    component: 'ApiSelect',
+    component: 'ApiTreeSelect',
     componentProps: {
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'message_type',
+      api: async () => {
+        const data = await getOrganizationList();
+
+        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);
+              }
+            }
+          });
+        };
+        copyTransFun(data as any as any[]);
+        return data;
       },
-      labelField: 'itemText',
-      valueField: 'itemValue',
     },
   },
   {
-    field: 'platformType',
+    field: 'phone',
     label: '手机号码',
     required: true,
     component: 'Input',
     componentProps: {
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'platform_type',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
+      placeholder: '请输入手机号码',
     },
   },
   {
-    field: 'accessKeyId',
-    label: 'accessKeyId',
-    required: true,
+    field: 'email',
+    label: '邮箱',
     component: 'Input',
-    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
-  },
-  {
-    field: 'accessKeySecret',
-    label: 'accessKeySecret',
-    required: true,
-    component: 'Input',
-    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
+    componentProps: {
+      placeholder: '请输入邮箱',
+    },
   },
   {
-    field: 'host',
-    label: '服务器地址',
-    defaultValue: 'smtp.163.com',
-    required: true,
+    field: 'wechat',
+    label: '微信',
     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')),
+    componentProps: {
+      placeholder: '请输入微信号',
+    },
   },
   {
-    field: 'username',
-    label: '用户名',
-    required: true,
+    field: 'addPeople',
+    label: '添加人',
     component: 'Input',
-    ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
-  },
-  {
-    field: 'password',
-    label: '密码',
-    required: true,
-    component: 'InputPassword',
-    ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
+    componentProps: {
+      placeholder: '请输入添加人',
+    },
   },
   {
-    field: 'config',
-    label: '消息配置',
-    component: 'Input',
-    show: false,
+    field: 'remark',
+    label: '备注',
+    component: 'InputTextArea',
+    componentProps: {
+      placeholder: '',
+    },
   },
   {
     field: 'id',
-    label: '主键',
+    label: '',
     component: 'Input',
-    show: false,
-  },
-  {
-    field: 'status',
-    label: '状态',
-    component: 'RadioButtonGroup',
-    defaultValue: 0,
     componentProps: {
-      options: [
-        { label: '启用', value: 1 },
-        { label: '停用', value: 0 },
-      ],
+      style: {
+        display: 'none',
+      },
     },
   },
-  {
-    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;
-};

 <template>
-  <div>
-    <BasicTable @register="registerTable">
+  <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"
+      :rowSelection="{
+        onChange: onSelectChange,
+        type: 'checkbox',
+      }"
+      rowKey="id"
+    >
       <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新增联系人 </a-button>
-        <a-button type="primary" color="error" @click="handleDelete"> 批量删除 </a-button>
+        <a-button
+          type="primary"
+          color="error"
+          @click="handleBatchDelete"
+          :disabled="hasBatchDelete"
+        >
+          批量删除
+        </a-button>
       </template>
       <template #action="{ record }">
         <TableAction
@@ -26,27 +43,31 @@
         />
       </template>
     </BasicTable>
-    <ContactDrawer @register="registerDrawer" @success="handleSuccess" />
-  </div>
+  </PageWrapper>
+  <ContactDrawer @register="registerDrawer" @success="handleSuccess" />
 </template>
 
 <script lang="ts">
-  import { defineComponent } from 'vue';
+  import { defineComponent, reactive, ref, computed } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  // import { useGo } from '/@/hooks/web/usePage';
+  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';
-  import {} from '/@/api/alarm/contact/alarmContact';
   export default defineComponent({
     components: {
+      PageWrapper,
+      OrganizationIdTree,
       BasicTable,
       TableAction,
       ContactDrawer,
     },
     setup() {
+      let selectedRowIds = ref<string[]>([]);
+      const hasBatchDelete = computed(() => selectedRowIds.value.length <= 0);
       const [registerTable, { reload }] = useTable({
         api: getAlarmContact,
         columns,
@@ -68,20 +89,23 @@
       });
       const [registerDrawer, { openDrawer }] = useDrawer();
       const { createMessage } = useMessage();
+      const searchInfo = reactive<Recordable>({});
+      // 新增
       const handleCreate = () => {
         openDrawer(true, {
           isUpdate: false,
         });
       };
+      // 编辑
       const handleEdit = (record: Recordable) => {
         openDrawer(true, {
-          record,
           isUpdate: true,
+          record,
         });
       };
+      // 删除
       const handleDelete = async (record: Recordable) => {
         let ids: string[] = [record.id];
-        console.log(ids);
         try {
           await deleteAlarmContact(ids);
           createMessage.success('删除联系人成功');
@@ -90,14 +114,39 @@
           createMessage.error('删除失败');
         }
       };
+      // 批量删除
+      const handleBatchDelete = async () => {
+        try {
+          await deleteAlarmContact(selectedRowIds.value);
+          createMessage.success('批量删除联系人成功');
+          handleSuccess();
+        } catch (e) {
+          createMessage.error('删除失败');
+        }
+      };
       // 刷新
       const handleSuccess = () => {
         reload();
       };
+      // 复选框事件
+      const onSelectChange = (selectedRowKeys: string[]) => {
+        selectedRowIds.value = selectedRowKeys;
+      };
+      const handleSelect = (organizationId = '') => {
+        searchInfo.organizationId = organizationId;
+        console.log(organizationId);
+        reload();
+      };
       return {
+        searchInfo,
+        hasBatchDelete,
+        onSelectChange,
+        handleBatchDelete,
         handleEdit,
         handleCreate,
         handleDelete,
+        handleSelect,
+        handleSuccess,
         registerTable,
         registerDrawer,
         reload,

@@ -2,10 +2,10 @@ import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { h } from 'vue';
 import { Switch } from 'ant-design-vue';
-import {setMessageConfigStatus} from "/@/api/message/config";
+import { setMessageConfigStatus } from '/@/api/message/config';
 import { useMessage } from '/@/hooks/web/useMessage';
-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: '配置名称',
@@ -45,7 +45,7 @@ export const columns: BasicColumn[] = [
           record.pendingStatus = true;
           const newStatus = checked ? 1 : 0;
           const { createMessage } = useMessage();
-          setMessageConfigStatus(record.id, record.messageType,newStatus)
+          setMessageConfigStatus(record.id, record.messageType, newStatus)
             .then(() => {
               record.status = newStatus;
               createMessage.success(`修改成功`);
@@ -96,20 +96,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',
@@ -117,12 +116,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',
     },
   },
   {
@@ -131,70 +130,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',
@@ -212,5 +211,5 @@ export const formSchema: FormSchema[] = [
     label: '备注',
     field: 'remark',
     component: 'InputTextArea',
-  }
+  },
 ];

 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import {h} from "vue";
-import {Tag} from "ant-design-vue";
-import {useI18n} from "/@/hooks/web/useI18n";
+import { h } from 'vue';
+import { Tag } from 'ant-design-vue';
+import { useI18n } from '/@/hooks/web/useI18n';
 const { t } = useI18n();
 export const columns: BasicColumn[] = [
   {
@@ -13,7 +13,7 @@ export const columns: BasicColumn[] = [
   {
     title: '收件人',
     dataIndex: 'emailTo',
-    width:160,
+    width: 160,
   },
   {
     title: '状态',
@@ -23,21 +23,21 @@ export const columns: BasicColumn[] = [
       const status = record.status;
       const success = status === 'SUCCESS';
       const color = success ? 'green' : 'red';
-      let successText:string = t('routes.common.system.tableSuccessStatus');
-      let failedText:string = t('routes.common.system.tableFailedStatus');
+      let successText: string = t('routes.common.system.tableSuccessStatus');
+      let failedText: string = t('routes.common.system.tableFailedStatus');
       const text = success ? successText : failedText;
       return h(Tag, { color: color }, () => text);
-    }
+    },
   },
   {
     title: '用途',
     dataIndex: 'templatePurposeDictText',
-    width:160,
+    width: 160,
   },
   {
     title: '备注',
     dataIndex: 'remark',
-    width:160,
+    width: 160,
   },
   {
     title: '发送时间',

 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import {h} from "vue";
-import {Tag} from "ant-design-vue";
-import {useI18n} from "/@/hooks/web/useI18n";
+import { h } from 'vue';
+import { Tag } from 'ant-design-vue';
+import { useI18n } from '/@/hooks/web/useI18n';
 const { t } = useI18n();
 export const columns: BasicColumn[] = [
   {
@@ -13,7 +13,7 @@ export const columns: BasicColumn[] = [
   {
     title: '短信平台',
     dataIndex: 'typeDictText',
-    width:180,
+    width: 180,
   },
   {
     title: '用途',
@@ -28,11 +28,11 @@ export const columns: BasicColumn[] = [
       const status = record.status;
       const success = status === 'SUCCESS';
       const color = success ? 'green' : 'red';
-      let successText:string = t('routes.common.system.tableSuccessStatus');
-      let failedText:string = t('routes.common.system.tableFailedStatus');
+      let successText: string = t('routes.common.system.tableSuccessStatus');
+      let failedText: string = t('routes.common.system.tableFailedStatus');
       const text = success ? successText : failedText;
       return h(Tag, { color: color }, () => text);
-    }
+    },
   },
   {
     title: '备注',

 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import {findDictItemByCode} from "/@/api/system/dict";
-import {findMessageConfig} from "/@/api/message/config";
-import {isMessage} from "/@/views/message/config/config.data";
-import {h} from "vue";
-import {Switch} from "ant-design-vue";
-import {useMessage} from "/@/hooks/web/useMessage";
-import {setMessageTemplateStatus} from "/@/api/message/template";
+import { findDictItemByCode } from '/@/api/system/dict';
+import { findMessageConfig } from '/@/api/message/config';
+import { isMessage } from '/@/views/message/config/config.data';
+import { h } from 'vue';
+import { Switch } from 'ant-design-vue';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { setMessageTemplateStatus } from '/@/api/message/template';
 
 export const columns: BasicColumn[] = [
   {
@@ -31,8 +31,8 @@ export const columns: BasicColumn[] = [
     width: 180,
   },
   {
-    title:'模板用途',
-    dataIndex:'templatePurposeDictText',
+    title: '模板用途',
+    dataIndex: 'templatePurposeDictText',
     width: 180,
   },
   {
@@ -52,7 +52,7 @@ export const columns: BasicColumn[] = [
           record.pendingStatus = true;
           const newStatus = checked ? 1 : 0;
           const { createMessage } = useMessage();
-          setMessageTemplateStatus(record.id,record.templatePurpose,record.messageType,newStatus)
+          setMessageTemplateStatus(record.id, record.templatePurpose, record.messageType, newStatus)
             .then(() => {
               record.status = newStatus;
               createMessage.success(`修改成功`);
@@ -68,7 +68,7 @@ export const columns: BasicColumn[] = [
     title: '模板用途',
     dataIndex: 'templatePurpose',
     width: 180,
-    ifShow:false
+    ifShow: false,
   },
   {
     title: '创建时间',
@@ -96,8 +96,8 @@ export const formSchema: FormSchema[] = [
   {
     field: 'id',
     label: '主键',
-    component:'Input',
-    show:false,
+    component: 'Input',
+    show: false,
   },
   {
     field: 'messageType',
@@ -105,12 +105,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',
     },
   },
   {
@@ -119,13 +119,13 @@ export const formSchema: FormSchema[] = [
     required: true,
     component: 'ApiSelect',
     componentProps: {
-      api:findMessageConfig,
-      params:{
-        messageType:({values}) => Reflect.get(values,'messageType')
+      api: findMessageConfig,
+      params: {
+        messageType: ({ values }) => Reflect.get(values, 'messageType'),
       },
-      immediate:true,
-      labelField:'configName',
-      valueField:'id',
+      immediate: true,
+      labelField: 'configName',
+      valueField: 'id',
     },
   },
   {
@@ -139,14 +139,14 @@ export const formSchema: FormSchema[] = [
     label: '模板编号',
     required: true,
     component: 'Input',
-    ifShow:({values}) => isMessage(Reflect.get(values,'messageType')),
+    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
   {
     field: 'signName',
     label: '签名',
-    required:true,
+    required: true,
     component: 'Input',
-    ifShow:({values}) => isMessage(Reflect.get(values,'messageType')),
+    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
   {
     field: 'templatePurpose',
@@ -155,12 +155,12 @@ export const formSchema: FormSchema[] = [
     component: 'ApiSelect',
     helpMessage: ['用户登录、忘记密码模板平台只提供"code"参数', '初始密码设置平台提供"name"参数'],
     componentProps: {
-      api:findDictItemByCode,
-      params:{
-        dictCode:"template_purpose"
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'template_purpose',
       },
-      labelField:'itemText',
-      valueField:'itemValue',
+      labelField: 'itemText',
+      valueField: 'itemValue',
     },
   },
 ];

@@ -32,7 +32,7 @@ export const columns: BasicColumn[] = [
     title: '状态',
     dataIndex: 'userStatusEnum',
     width: 120,
-    slots: {customRender: 'status'}
+    slots: { customRender: 'status' },
   },
 ];
 
@@ -56,15 +56,15 @@ export const accountFormSchema: FormSchema[] = [
     field: 'id',
     label: 'id',
     component: 'Input',
-    show:false
+    show: false,
   },
   {
     field: 'username',
     label: '用户名',
     component: 'Input',
     colProps: { span: 12 },
-    dynamicDisabled:false,
-    dynamicRules:({values}) =>{
+    dynamicDisabled: false,
+    dynamicRules: ({ values }) => {
       return [
         {
           message: '请输入用户名',
@@ -73,28 +73,26 @@ export const accountFormSchema: FormSchema[] = [
         {
           validator(_, value) {
             return new Promise((resolve, reject) => {
-              if(value == '')
-              {
+              if (value == '') {
                 reject('请输入用户名');
-              }else {
-                if(values.username !=undefined && values.id == undefined){
-                  isAccountExist(value)
-                    .then((data) => {
-                      if(data.data !=null){
-                        reject('用户已存在');
-                      }else{
-                        resolve()
-                      }
-                    });
-                }else{
-                  resolve()
+              } else {
+                if (values.username != undefined && values.id == undefined) {
+                  isAccountExist(value).then((data) => {
+                    if (data.data != null) {
+                      reject('用户已存在');
+                    } else {
+                      resolve();
+                    }
+                  });
+                } else {
+                  resolve();
                 }
               }
             });
           },
         },
       ];
-    }
+    },
   },
   {
     field: 'password',
@@ -149,10 +147,10 @@ export const accountFormSchema: FormSchema[] = [
     label: '有效期: ',
     component: 'DatePicker',
     colProps: { span: 12 },
-    componentProps:{
-      showTime:true,
-      format:'YYYY-MM-DD HH:mm:ss'
-    }
+    componentProps: {
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+    },
   },
   {
     field: 'enabled',
@@ -162,8 +160,8 @@ export const accountFormSchema: FormSchema[] = [
     defaultValue: true,
     componentProps: {
       options: [
-        {label: '启用', value: true},
-        {label: '禁用', value: false},
+        { label: '启用', value: true },
+        { label: '禁用', value: false },
       ],
     },
   },
@@ -171,6 +169,6 @@ export const accountFormSchema: FormSchema[] = [
     field: 'organizationIds',
     label: ' ',
     component: 'Input',
-    slot:'organizationId',
+    slot: 'organizationId',
   },
 ];

-import {DescItem} from "/@/components/Description";
+import { DescItem } from '/@/components/Description';
 
 export const accountSchema: DescItem[] = [
   {

@@ -78,7 +78,6 @@
 
   export default defineComponent({
     name: 'AccountManagement',
-
     components: { BasicTable, PageWrapper, OrganizationIdTree, AccountModal, TableAction, Tag },
     setup() {
       const go = useGo();

@@ -25,7 +25,7 @@ export const columns: BasicColumn[] = [
   {
     title: '更新时间',
     dataIndex: 'updateTime',
-    width: 180
+    width: 180,
   },
 ];
 
@@ -49,7 +49,7 @@ export const formSchema: FormSchema[] = [
     field: 'dictName',
     label: '字典名称',
     required: true,
-    component: 'Input'
+    component: 'Input',
   },
   {
     field: 'dictCode',

 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import {h} from "vue";
-import {Switch} from "ant-design-vue";
-import {setDictItemStatus} from "/@/api/system/dict";
-import {useMessage} from "/@/hooks/web/useMessage";
+import { h } from 'vue';
+import { Switch } from 'ant-design-vue';
+import { setDictItemStatus } from '/@/api/system/dict';
+import { useMessage } from '/@/hooks/web/useMessage';
 export const columns: BasicColumn[] = [
   {
     title: '文本值',
@@ -13,7 +13,7 @@ export const columns: BasicColumn[] = [
   {
     title: '字典值',
     dataIndex: 'itemValue',
-    width:180,
+    width: 180,
   },
   {
     title: '描述',
@@ -37,7 +37,7 @@ export const columns: BasicColumn[] = [
           record.pendingStatus = true;
           const newStatus = checked ? 1 : 0;
           const { createMessage } = useMessage();
-          setDictItemStatus(record.id,newStatus)
+          setDictItemStatus(record.id, newStatus)
             .then(() => {
               record.status = newStatus;
               createMessage.success(`修改成功`);
@@ -52,7 +52,7 @@ export const columns: BasicColumn[] = [
   {
     title: '排序',
     dataIndex: 'sort',
-    width: 80
+    width: 80,
   },
   {
     title: '创建时间',
@@ -72,7 +72,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'dictId',
     label: '文本值',
     component: 'Input',
-    show:false,
+    show: false,
   },
 ];
 
@@ -81,7 +81,7 @@ export const formSchema: FormSchema[] = [
     field: 'itemText',
     label: '文本值',
     required: true,
-    component: 'Input'
+    component: 'Input',
   },
   {
     field: 'itemValue',
@@ -93,7 +93,7 @@ export const formSchema: FormSchema[] = [
     field: 'sort',
     label: '排序',
     component: 'InputNumber',
-    defaultValue:1,
+    defaultValue: 1,
   },
   {
     field: 'status',

@@ -3,24 +3,24 @@ import { FormSchema } from '/@/components/Table';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
 import { Icon } from '/@/components/Icon';
-import {useI18n} from "/@/hooks/web/useI18n";
+import { useI18n } from '/@/hooks/web/useI18n';
 const { t } = useI18n();
 
 //菜单管理页，所需的列 配置
 export const columns: BasicColumn[] = [
   {
-    title: t('routes.common.system.tableTitleSystemMenuName'),//菜单名称
+    title: t('routes.common.system.tableTitleSystemMenuName'), //菜单名称
     // title:'菜单名称',
     dataIndex: 'meta.title',
     width: 200,
     align: 'left',
     customRender: ({ record }) => {
-      record = t(record.meta.title);//国际化处理
+      record = t(record.meta.title); //国际化处理
       return record;
     },
   },
   {
-    title: t('routes.common.system.tableTitleSystemIcon'),//图标
+    title: t('routes.common.system.tableTitleSystemIcon'), //图标
     // title:'图标',
     dataIndex: 'meta.icon',
     width: 50,
@@ -29,24 +29,24 @@ export const columns: BasicColumn[] = [
     },
   },
   {
-    title: t('routes.common.system.tableTitleSystemPermissionTag'),//权限标识
+    title: t('routes.common.system.tableTitleSystemPermissionTag'), //权限标识
     // title:'权限标识',
     dataIndex: 'permission',
     width: 180,
   },
   {
-    title: t('routes.common.system.tableTitleSystemComponents'),//'组件'
+    title: t('routes.common.system.tableTitleSystemComponents'), //'组件'
     // title:'组件',
     dataIndex: 'component',
   },
   {
-    title: t('routes.common.system.tableTitleSystemSort'),//'排序'
+    title: t('routes.common.system.tableTitleSystemSort'), //'排序'
     // title:'排序',
     dataIndex: 'sort',
     width: 50,
   },
   {
-    title: t('routes.common.system.tableTitleSystemStatus'),//'状态'
+    title: t('routes.common.system.tableTitleSystemStatus'), //'状态'
     // title:'状态',
     dataIndex: 'status',
     width: 80,
@@ -54,14 +54,14 @@ export const columns: BasicColumn[] = [
       const status = record.meta.status;
       const enable = ~~status === 0;
       const color = enable ? 'green' : 'red';
-      let enableText:string = t('routes.common.system.tableTitleSystemEnable');//国际化处理--启用
-      let stopText:string = t('routes.common.system.tableTitleSystemStop');//国际化处理--停用
+      let enableText: string = t('routes.common.system.tableTitleSystemEnable'); //国际化处理--启用
+      let stopText: string = t('routes.common.system.tableTitleSystemStop'); //国际化处理--停用
       const text = enable ? enableText : stopText;
       return h(Tag, { color: color }, () => text);
     },
   },
   {
-    title: t('routes.common.system.tableTitleSystemCreateTime'),//'创建时间'
+    title: t('routes.common.system.tableTitleSystemCreateTime'), //'创建时间'
     // title:'创建时间',
     dataIndex: 'createTime',
     width: 180,
@@ -76,14 +76,14 @@ const isButton = (type: string) => type === '2';
 export const searchFormSchema: FormSchema[] = [
   {
     field: 'menuName',
-    label: t('routes.common.system.tableTitleSystemMenuName'),//菜单名称
+    label: t('routes.common.system.tableTitleSystemMenuName'), //菜单名称
     // label: '菜单名称',
     component: 'Input',
     colProps: { span: 8 },
   },
   {
     field: 'status',
-    label: t('routes.common.system.tableTitleSystemStatus'),//状态
+    label: t('routes.common.system.tableTitleSystemStatus'), //状态
     // label: '状态',
     component: 'Select',
     componentProps: {
@@ -99,38 +99,35 @@ export const searchFormSchema: FormSchema[] = [
   },
 ];
 
-
-
-
 //----------------------------------新增、编辑----------------------------------------------------------
 export const formSchema: FormSchema[] = [
   {
     field: 'menuType',
-    label: t('routes.common.system.menuEditPagesMenuType'),//菜单类型
+    label: t('routes.common.system.menuEditPagesMenuType'), //菜单类型
     component: 'RadioButtonGroup',
     defaultValue: '0',
     componentProps: {
       options: [
-        { label: t('routes.common.system.menuEditPagesDirectory'), value: '0' },//目录
-        { label: t('routes.common.system.menuEditPagesMenu'), value: '1' },//菜单
-        { label: t('routes.common.system.menuEditPagesButton'), value: '2' },//按钮
+        { label: t('routes.common.system.menuEditPagesDirectory'), value: '0' }, //目录
+        { label: t('routes.common.system.menuEditPagesMenu'), value: '1' }, //菜单
+        { label: t('routes.common.system.menuEditPagesButton'), value: '2' }, //按钮
       ],
       onChange: (e) => {
-        console.log("--------11111---------------",e);
+        console.log('--------11111---------------', e);
       },
     },
     colProps: { lg: 24, md: 24 },
   },
   {
     field: 'title',
-    label: t('routes.common.system.tableTitleSystemMenuName'),//菜单名称
+    label: t('routes.common.system.tableTitleSystemMenuName'), //菜单名称
     component: 'Input',
     required: true,
   },
 
   {
     field: 'parentId',
-    label: t('routes.common.system.menuEditPagesParentMenu'),//上级菜单
+    label: t('routes.common.system.menuEditPagesParentMenu'), //上级菜单
     component: 'TreeSelect',
     componentProps: {
       replaceFields: {
@@ -144,88 +141,88 @@ export const formSchema: FormSchema[] = [
 
   {
     field: 'sort',
-    label: t('routes.common.system.tableTitleSystemSort'),//排序
+    label: t('routes.common.system.tableTitleSystemSort'), //排序
     component: 'InputNumber',
     required: true,
   },
   {
     field: 'icon',
-    label: t('routes.common.system.tableTitleSystemIcon'),//图标
+    label: t('routes.common.system.tableTitleSystemIcon'), //图标
     component: 'IconPicker',
     required: true,
-    ifShow: ({ values }) => !isButton(Reflect.get(values,'menuType')),
+    ifShow: ({ values }) => !isButton(Reflect.get(values, 'menuType')),
   },
 
   {
     field: 'path',
-    label: t('routes.common.system.menuEditPagesRouterAddress'),//路由地址
+    label: t('routes.common.system.menuEditPagesRouterAddress'), //路由地址
     component: 'Input',
     required: true,
-    ifShow: ({ values }) => !isButton(Reflect.get(values,'menuType')),
+    ifShow: ({ values }) => !isButton(Reflect.get(values, 'menuType')),
   },
   {
     field: 'component',
-    label: t('routes.common.system.menuEditPagesComponentsPath'),//组件路径
+    label: t('routes.common.system.menuEditPagesComponentsPath'), //组件路径
     component: 'Input',
-    ifShow: ({ values }) => isMenu(Reflect.get(values,'menuType')),
+    ifShow: ({ values }) => isMenu(Reflect.get(values, 'menuType')),
   },
   {
     field: 'permission',
-    label: t('routes.common.system.tableTitleSystemPermissionTag'),//权限标识
+    label: t('routes.common.system.tableTitleSystemPermissionTag'), //权限标识
     component: 'Input',
-    ifShow: ({ values }) => !isDir(Reflect.get(values,'menuType')),
+    ifShow: ({ values }) => !isDir(Reflect.get(values, 'menuType')),
   },
   {
     field: 'status',
-    label: t('routes.common.system.tableTitleSystemStatus'),//状态
+    label: t('routes.common.system.tableTitleSystemStatus'), //状态
     component: 'RadioButtonGroup',
     defaultValue: '0',
     componentProps: {
       options: [
-        { label: t('routes.common.system.tableTitleSystemEnable'), value: '0' },//启用
-        { label: t('routes.common.system.tableTitleSystemStop'), value: '1' },//禁用
+        { label: t('routes.common.system.tableTitleSystemEnable'), value: '0' }, //启用
+        { label: t('routes.common.system.tableTitleSystemStop'), value: '1' }, //禁用
       ],
     },
   },
   {
     field: 'isLink',
-    label: t('routes.common.system.menuEditPagesIsExt'),//是否外链
+    label: t('routes.common.system.menuEditPagesIsExt'), //是否外链
     component: 'RadioButtonGroup',
     defaultValue: false,
     componentProps: {
       options: [
-        { label: t('routes.common.system.menuEditPagesYes'), value: true },//是
-        { label: t('routes.common.system.menuEditPagesNo'), value: false },//否
+        { label: t('routes.common.system.menuEditPagesYes'), value: true }, //是
+        { label: t('routes.common.system.menuEditPagesNo'), value: false }, //否
       ],
     },
-    ifShow: ({ values }) => !isButton(Reflect.get(values,'menuType')),
+    ifShow: ({ values }) => !isButton(Reflect.get(values, 'menuType')),
   },
 
   {
     field: 'ignoreKeepAlive',
-    label: t('routes.common.system.menuEditPagesIsKeepAlive'),//是否缓存
+    label: t('routes.common.system.menuEditPagesIsKeepAlive'), //是否缓存
     component: 'RadioButtonGroup',
     defaultValue: false,
     componentProps: {
       options: [
-        { label: t('routes.common.system.menuEditPagesYes'), value: true },//是
-        { label: t('routes.common.system.menuEditPagesNo'), value: false },//否
+        { label: t('routes.common.system.menuEditPagesYes'), value: true }, //是
+        { label: t('routes.common.system.menuEditPagesNo'), value: false }, //否
       ],
     },
-    ifShow: ({ values }) => isMenu(Reflect.get(values,'menuType')),
+    ifShow: ({ values }) => isMenu(Reflect.get(values, 'menuType')),
   },
 
   {
     field: 'hideMenu',
-    label: t('routes.common.system.menuEditPagesIsHide'),//是否隐藏
+    label: t('routes.common.system.menuEditPagesIsHide'), //是否隐藏
     component: 'RadioButtonGroup',
     defaultValue: false,
     componentProps: {
       options: [
-        { label: t('routes.common.system.menuEditPagesYes'), value: true },//是
-        { label: t('routes.common.system.menuEditPagesNo'), value: false },//否
+        { label: t('routes.common.system.menuEditPagesYes'), value: true }, //是
+        { label: t('routes.common.system.menuEditPagesNo'), value: false }, //否
       ],
     },
-    ifShow: ({ values }) => !isButton(Reflect.get(values,'menuType')),
+    ifShow: ({ values }) => !isButton(Reflect.get(values, 'menuType')),
   },
 ];

@@ -116,9 +116,9 @@
       }
 
       return {
+        getI18n,
         registerTable,
         registerModal,
-        getI18n,
         getDeleteTitle,
         handleCreate,
         handleEdit,

 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import {useI18n} from "/@/hooks/web/useI18n";
+import { useI18n } from '/@/hooks/web/useI18n';
 const { t } = useI18n();
 
 export const columns: BasicColumn[] = [
@@ -11,17 +11,17 @@ export const columns: BasicColumn[] = [
     align: 'left',
   },
   {
-    title: t('routes.common.common.sort'),//排序
+    title: t('routes.common.common.sort'), //排序
     dataIndex: 'sort',
     width: 50,
   },
   {
-    title: t('routes.common.common.createTime'),//创建时间
+    title: t('routes.common.common.createTime'), //创建时间
     dataIndex: 'createTime',
     width: 180,
   },
   {
-    title: t('routes.common.common.remark'),//备注
+    title: t('routes.common.common.remark'), //备注
     dataIndex: 'remark',
     width: 300,
   },
@@ -49,12 +49,12 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'sort',
-    label: t('routes.common.common.sort'),//排序
+    label: t('routes.common.common.sort'), //排序
     component: 'InputNumber',
     required: true,
   },
   {
-    label: t('routes.common.common.remark'),//备注
+    label: t('routes.common.common.remark'), //备注
     field: 'remark',
     component: 'InputTextArea',
   },

 import { FormSchema } from '/@/components/Form';
-import {InputRegExp} from "/@/enums/regexpEnum";
+import { InputRegExp } from '/@/enums/regexpEnum';
 export const formSchema: FormSchema[] = [
   {
     field: 'passwordOld',
@@ -39,8 +39,10 @@ export const formSchema: FormSchema[] = [
             }
 
             const pwdRegex = new RegExp(InputRegExp.PASSWORD_INPUT);
-            if(!pwdRegex.test(value)){
-              return Promise.reject('密码中必须包含大小写 字母、数字、特称字符，至少8个字符，最多30个字符');
+            if (!pwdRegex.test(value)) {
+              return Promise.reject(
+                '密码中必须包含大小写 字母、数字、特称字符，至少8个字符，最多30个字符'
+              );
             }
             return Promise.resolve();
           },

@@ -17,6 +17,7 @@
           checkable
           toolbar
           title="菜单分配"
+          @check="handleCheckClick"
         />
       </template>
     </BasicForm>
@@ -38,17 +39,17 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import { RouteItem } from '/@/api/sys/model/menuModel';
   import { saveOrUpdateRoleInfoWithMenu } from '/@/api/system/system';
-
   export default defineComponent({
     name: 'RoleDrawer',
     components: { BasicDrawer, BasicForm, BasicTree },
     emits: ['success', 'register'],
     setup(_, { emit }) {
-      const isUpdate = ref(true);
+      const isUpdate = ref<boolean>(true);
       const treeData = ref<TreeItem[]>([]);
       const roleMenus = ref<string[]>([]);
-      const roleId = ref('');
-
+      const allCheckedKeys = ref<string[]>();
+      const roleHalfCheckedKeys = ref<string[]>([]);
+      const roleId = ref<string>('');
       const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
         labelWidth: 90,
         schemas: formSchema,
@@ -72,9 +73,10 @@
         setDrawerProps({ confirmLoading: false });
         // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
         if (unref(treeData).length === 0) {
+          // 获取全部的菜单
           const menuListModel = await getMenuList();
           processChildren(menuListModel);
-          let treeValues = new Array<TreeItem>();
+          let treeValues: TreeItem[] = [];
           menuListModel.map((item) => {
             const data = {
               menuName: t(item.meta.title),
@@ -87,8 +89,10 @@
           treeData.value = treeValues;
         }
         if (data.record) {
+          // 通过角色id去获取角色对应的菜单的ids
           roleMenus.value = await getMenusIdsByRoleId(data.record.id);
           console.log(roleMenus.value, 'roleMenus.value');
+          // TODO: 角色回显问题：待解决
           roleId.value = data.record.id;
         }
         isUpdate.value = !!data?.isUpdate;
@@ -110,7 +114,7 @@
             name: values.name,
             remark: values.remark,
             status: values.status,
-            menu: [...values.menu],
+            menu: allCheckedKeys.value as string[],
           };
           saveOrUpdateRoleInfoWithMenu(req).then(() => {
             closeDrawer();
@@ -120,14 +124,22 @@
           setDrawerProps({ confirmLoading: false });
         }
       }
+      // Tree check事件
+      const handleCheckClick = (checkedKeys: string[], { halfCheckedKeys }) => {
+        allCheckedKeys.value = [...checkedKeys, ...halfCheckedKeys];
+        // 父节点
+        roleHalfCheckedKeys.value = halfCheckedKeys;
+      };
 
       return {
+        allCheckedKeys,
         registerDrawer,
         registerForm,
         getTitle,
         handleSubmit,
         treeData,
         roleMenus,
+        handleCheckClick,
       };
     },
   });

-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import {h} from 'vue';
-import {Switch} from 'ant-design-vue';
-import {setRoleStatus} from '/@/api/system/system';
-import {useMessage} from '/@/hooks/web/useMessage';
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { h } from 'vue';
+import { Switch } from 'ant-design-vue';
+import { setRoleStatus } from '/@/api/system/system';
+import { useMessage } from '/@/hooks/web/useMessage';
 
 export const columns: BasicColumn[] = [
   {
@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     title: '状态',
     dataIndex: 'status',
     width: 120,
-    customRender: ({record}) => {
+    customRender: ({ record }) => {
       if (!Reflect.has(record, 'pendingStatus')) {
         record.pendingStatus = false;
       }
@@ -32,7 +32,7 @@ export const columns: BasicColumn[] = [
         onChange(checked: boolean) {
           record.pendingStatus = true;
           const newStatus = checked ? 1 : 0;
-          const {createMessage} = useMessage();
+          const { createMessage } = useMessage();
           setRoleStatus(record.id, newStatus)
             .then(() => {
               record.status = newStatus;
@@ -52,7 +52,7 @@ export const columns: BasicColumn[] = [
   {
     title: '备注',
     dataIndex: 'remark',
-    width:240,
+    width: 240,
   },
   {
     title: '创建时间',
@@ -66,7 +66,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'roleName',
     label: '角色名称',
     component: 'Input',
-    colProps: {span: 8},
+    colProps: { span: 8 },
   },
   {
     field: 'status',
@@ -74,11 +74,11 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Select',
     componentProps: {
       options: [
-        {label: '启用', value: 1},
-        {label: '停用', value: 0},
+        { label: '启用', value: 1 },
+        { label: '停用', value: 0 },
       ],
     },
-    colProps: {span: 8},
+    colProps: { span: 8 },
   },
 ];
 
@@ -96,8 +96,8 @@ export const formSchema: FormSchema[] = [
     defaultValue: 0,
     componentProps: {
       options: [
-        {label: '启用', value: 1},
-        {label: '停用', value: 0},
+        { label: '启用', value: 1 },
+        { label: '停用', value: 0 },
       ],
     },
   },

-import { BasicColumn } from "/@/components/Table/src/types/table";
-import {FormSchema} from "/@/components/Form";
-import {getAllRoleList} from "/@/api/system/system";
-import {RoleEnum} from "/@/enums/roleEnum";
+import { BasicColumn } from '/@/components/Table/src/types/table';
+import { FormSchema } from '/@/components/Form';
+import { getAllRoleList } from '/@/api/system/system';
+import { RoleEnum } from '/@/enums/roleEnum';
 
 export function getBasicColumns(): BasicColumn[] {
-    return [
-      {
-        title: '图标',
-        dataIndex: 'icon',
-        fixed: 'left',
-        width: 50,
-        slots: { customRender: 'img' },
-      },
-      {
-        title: '名称',
-        dataIndex: 'name',
-        width: 150,
-      },
-      {
-        title: '描述',
-        dataIndex: 'description',
-        width: 150,
-      },
-      {
-        title: '状态',
-        dataIndex: 'userStatusEnum',
-        width: 50,
-        slots: { customRender: 'status' },
-      },
-      {
-        title: '有效期',
-        dataIndex: 'tenantExpireTime',
-        width: 150,
-      },
-      {
-        title: '创建时间',
-        dataIndex: 'createTime',
-        width: 150,
-      },
-    ]
-    }
+  return [
+    {
+      title: '图标',
+      dataIndex: 'icon',
+      fixed: 'left',
+      width: 50,
+      slots: { customRender: 'img' },
+    },
+    {
+      title: '名称',
+      dataIndex: 'name',
+      width: 150,
+    },
+    {
+      title: '描述',
+      dataIndex: 'description',
+      width: 150,
+    },
+    {
+      title: '状态',
+      dataIndex: 'userStatusEnum',
+      width: 50,
+      slots: { customRender: 'status' },
+    },
+    {
+      title: '有效期',
+      dataIndex: 'tenantExpireTime',
+      width: 150,
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      width: 150,
+    },
+  ];
+}
 export const tenantFormSchema: FormSchema[] = [
   {
     field: 'id',
     label: 'id',
     slot: 'iconSelect',
     component: 'Input',
-    show:false
+    show: false,
   },
   {
     field: 'icon',
@@ -67,12 +67,12 @@ export const tenantFormSchema: FormSchema[] = [
     required: true,
     componentProps: {
       mode: 'multiple',
-      api:getAllRoleList,
-      params:{
-        roleType:RoleEnum.ROLE_TENANT_ADMIN
+      api: getAllRoleList,
+      params: {
+        roleType: RoleEnum.ROLE_TENANT_ADMIN,
       },
-      labelField:'name',
-      valueField:'id',
+      labelField: 'name',
+      valueField: 'id',
     },
   },
   {
@@ -82,8 +82,8 @@ export const tenantFormSchema: FormSchema[] = [
     defaultValue: true,
     componentProps: {
       options: [
-        {label: '启用', value: true},
-        {label: '停用', value: false},
+        { label: '启用', value: true },
+        { label: '停用', value: false },
       ],
     },
   },
@@ -91,15 +91,14 @@ export const tenantFormSchema: FormSchema[] = [
     field: 'tenantExpireTime',
     label: '有效期: ',
     component: 'DatePicker',
-    componentProps:{
-      showTime:true,
-      format:'YYYY-MM-DD HH:mm:ss'
-    }
+    componentProps: {
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+    },
   },
   {
     label: '备注: ',
     field: 'description',
     component: 'InputTextArea',
   },
-
 ];

-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import {h} from 'vue';
-import {Switch} from 'ant-design-vue';
-import {setRoleStatus} from '/@/api/system/system';
-import {useMessage} from '/@/hooks/web/useMessage';
-import {RoleEnum} from "/@/enums/roleEnum";
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { h } from 'vue';
+import { Switch } from 'ant-design-vue';
+import { setRoleStatus } from '/@/api/system/system';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { RoleEnum } from '/@/enums/roleEnum';
 export const columns: BasicColumn[] = [
   {
     title: '角色名称',
@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     title: '状态',
     dataIndex: 'status',
     width: 120,
-    customRender: ({record}) => {
+    customRender: ({ record }) => {
       if (!Reflect.has(record, 'pendingStatus')) {
         record.pendingStatus = false;
       }
@@ -32,7 +32,7 @@ export const columns: BasicColumn[] = [
         onChange(checked: boolean) {
           record.pendingStatus = true;
           const newStatus = checked ? 1 : 0;
-          const {createMessage} = useMessage();
+          const { createMessage } = useMessage();
           setRoleStatus(record.id, newStatus)
             .then(() => {
               record.status = newStatus;
@@ -52,7 +52,7 @@ export const columns: BasicColumn[] = [
   {
     title: '备注',
     dataIndex: 'remark',
-    width:240,
+    width: 240,
   },
   {
     title: '创建时间',
@@ -66,15 +66,15 @@ export const searchFormSchema: FormSchema[] = [
     field: 'roleName',
     label: '角色名称',
     component: 'Input',
-    colProps: {span: 8},
+    colProps: { span: 8 },
   },
   {
     field: 'roleType',
     label: '',
     component: 'Input',
-    colProps: {span: 8},
-    defaultValue:RoleEnum.ROLE_TENANT_ADMIN,
-    ifShow:false
+    colProps: { span: 8 },
+    defaultValue: RoleEnum.ROLE_TENANT_ADMIN,
+    ifShow: false,
   },
   {
     field: 'status',
@@ -82,11 +82,11 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Select',
     componentProps: {
       options: [
-        {label: '启用', value: 1},
-        {label: '停用', value: 0},
+        { label: '启用', value: 1 },
+        { label: '停用', value: 0 },
       ],
     },
-    colProps: {span: 8},
+    colProps: { span: 8 },
   },
 ];
 
@@ -104,8 +104,8 @@ export const formSchema: FormSchema[] = [
     defaultValue: 0,
     componentProps: {
       options: [
-        {label: '启用', value: 1},
-        {label: '停用', value: 0},
+        { label: '启用', value: 1 },
+        { label: '停用', value: 0 },
       ],
     },
   },

@@ -21,7 +21,7 @@ export interface RequestOptions {
   ignoreCancelToken?: boolean;
   // Whether to send token in header
   withToken?: boolean;
-  catchFirst?:boolean;
+  catchFirst?: boolean;
 }
 
 export interface Result<T = any> {