diff --git a/securityManagement/.env.development b/securityManagement/.env.development index e876cce..5c29a1e 100644 --- a/securityManagement/.env.development +++ b/securityManagement/.env.development @@ -5,7 +5,7 @@ VITE_DROP_CONSOLE=false # axios VITE_APP_BASE_API=/api -VITE_APP_PROXY_URL=http://172.10.10.151:8765 +VITE_APP_PROXY_URL=http://172.10.10.93:8765 # rsa 公钥 VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJps/EXxxSpEM1Ix4R0NWIOBciHCr7P7coDT8tNKfelgR7txcJOqHCO/MIWe7T04aHQTcpQxqx9hMca7dbqz8TZpz9jvLzE/6ZonVKxHsoFnNlHMp1/CPAJ9f6D9wYicum2KltJkmQ0g//D9W2zPCYoGOmSRFcZx/KEBa4EM53jQIDAQAB diff --git a/securityManagement/src/config/index.ts b/securityManagement/src/config/index.ts index 7934799..f5c4938 100644 --- a/securityManagement/src/config/index.ts +++ b/securityManagement/src/config/index.ts @@ -3,7 +3,10 @@ import {SystemMenu} from "@/types/config"; export const ROUTER_WHITE_LIST: string[] = ['/login', '/test','/enterprise']; export const CLIENT_TYPE:string = "MANAGEMENT_SECURITY"; - +export const UNIT_TYPE = { + security: 'SECURITY_UNIT', + police: 'POLICE_UNIT' +} export const SYSTEM_MENUS: SystemMenu[] = [ { title: '首页', diff --git a/securityManagement/src/types/config/index.ts b/securityManagement/src/types/config/index.ts index f81e2db..05d2b12 100644 --- a/securityManagement/src/types/config/index.ts +++ b/securityManagement/src/types/config/index.ts @@ -10,3 +10,4 @@ export interface SystemMenu { component?: RouteComponent; children?: SystemMenu[]; } + diff --git a/securityManagement/src/types/views/bgManagement.ts b/securityManagement/src/types/views/bgManagement.ts index 6986e6d..8f6b7fa 100644 --- a/securityManagement/src/types/views/bgManagement.ts +++ b/securityManagement/src/types/views/bgManagement.ts @@ -8,7 +8,7 @@ export interface BgManagementPagerQueryParams extends BaseTableRowRecord{ /** 行政区划编码 **/ administrativeDivisionCodes?: string[]; /** 是否启用 **/ - isEnable?: number; + isEnable?: BaseEnum; /** 审核状态 **/ checkStatus?: number; /** 账号 **/ @@ -18,5 +18,15 @@ export interface BgManagementPagerQueryParams extends BaseTableRowRecord{ createTime?:string, snowFlakeId?:string, remark?:string, + isAdmin?:BaseEnum +} + +export interface FromItem { + snowFlakeId?: string, + name: string, + sex: number, + telephone: string, + isEnable: BaseEnum, + remark?: string, } diff --git a/securityManagement/src/views/test.vue b/securityManagement/src/views/test.vue index 057eb32..39d9e87 100644 --- a/securityManagement/src/views/test.vue +++ b/securityManagement/src/views/test.vue @@ -1,264 +1,11 @@ + + \ No newline at end of file diff --git a/securityManagement/src/views/userManagement/bgManagement/index.vue b/securityManagement/src/views/userManagement/bgManagement/index.vue index d3e0a2c..1e3030d 100644 --- a/securityManagement/src/views/userManagement/bgManagement/index.vue +++ b/securityManagement/src/views/userManagement/bgManagement/index.vue @@ -1,12 +1,248 @@ - - \ No newline at end of file +