diff --git a/src/api/platform/common/controller/pushBlacklist.ts b/src/api/platform/common/controller/pushBlacklist.ts deleted file mode 100644 index 46403ab..0000000 --- a/src/api/platform/common/controller/pushBlacklist.ts +++ /dev/null @@ -1,25 +0,0 @@ -/** - * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 - * Copyright © 2020-2022 entfrm All rights reserved. - * author entfrm开发团队-王翔 - */ -import type { PushBlacklist, PushBlacklistParams, PushBlacklistResult } from '/@/api/platform/common/entity/pushBlacklist'; -import { defHttp } from '/@/utils/http/axios'; - -enum Api { - list = '/common_proxy/common/pushCertification/list', - add = '/common_proxy/common/pushCertification/save', - get = '/common_proxy/common/pushCertification', - edit = '/common_proxy/common/pushCertification/update', - del = '/common_proxy/common/pushCertification/remove', -} - -export const listPushBlacklist = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); - -export const addPushBlacklist = (params: Partial) => defHttp.post({ url: Api.add, data: params }); - -export const editPushBlacklist = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); - -export const getPushBlacklist = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); - -export const delPushBlacklist = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); diff --git a/src/api/platform/common/controller/pushCertification.ts b/src/api/platform/common/controller/pushCertification.ts deleted file mode 100644 index da7768b..0000000 --- a/src/api/platform/common/controller/pushCertification.ts +++ /dev/null @@ -1,25 +0,0 @@ -/** - * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 - * Copyright © 2020-2022 entfrm All rights reserved. - * author entfrm开发团队-王翔 - */ -import type { PushCertification, PushCertificationParams, PushCertificationResult } from '/@/api/platform/common/entity/pushCertification'; -import { defHttp } from '/@/utils/http/axios'; - -enum Api { - list = '/common_proxy/common/pushCertification/list', - add = '/common_proxy/common/pushCertification/save', - get = '/common_proxy/common/pushCertification', - edit = '/common_proxy/common/pushCertification/update', - del = '/common_proxy/common/pushCertification/remove', -} - -export const listPushCertification = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); - -export const addPushCertification = (params: Partial) => defHttp.post({ url: Api.add, data: params }); - -export const editPushCertification = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); - -export const getPushCertification = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); - -export const delPushCertification = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); diff --git a/src/api/platform/common/controller/pushCustomType.ts b/src/api/platform/common/controller/pushCustomType.ts new file mode 100644 index 0000000..9e29195 --- /dev/null +++ b/src/api/platform/common/controller/pushCustomType.ts @@ -0,0 +1,25 @@ +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import type { PushCustomType, PushCustomTypeParams, PushCustomTypeResult } from '/@/api/platform/common/entity/pushCustomType'; +import { defHttp } from '/@/utils/http/axios'; + +enum Api { + list = '/common_proxy/common/pushCustomType/list', + add = '/common_proxy/common/pushCustomType/save', + get = '/common_proxy/common/pushCustomType', + edit = '/common_proxy/common/pushCustomType/update', + del = '/common_proxy/common/pushCustomType/remove', +} + +export const listPushCustomType = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); + +export const addPushCustomType = (params: Partial) => defHttp.post({ url: Api.add, data: params }); + +export const editPushCustomType = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); + +export const getPushCustomType = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); + +export const delPushCustomType = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); diff --git a/src/api/platform/common/controller/pushManage.ts b/src/api/platform/common/controller/pushManage.ts deleted file mode 100644 index fdc497e..0000000 --- a/src/api/platform/common/controller/pushManage.ts +++ /dev/null @@ -1,25 +0,0 @@ -/** - * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 - * Copyright © 2020-2022 entfrm All rights reserved. - * author entfrm开发团队-王翔 - */ -import type { PushManage, PushManageParams } from '/@/api/platform/common/entity/pushManage'; -import { defHttp } from '/@/utils/http/axios'; - -enum Api { - list = '/common_proxy/common/pushManage/list', - add = '/common_proxy/common/pushManage/save', - get = '/common_proxy/common/pushManage', - edit = '/common_proxy/common/pushManage/update', - del = '/common_proxy/common/pushManage/remove', -} - -export const listPushManage = (params?: Partial) => defHttp.get({ url: Api.list, params }); - -export const addPushManage = (params: Partial) => defHttp.post({ url: Api.add, data: params }); - -export const editPushManage = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); - -export const getPushManage = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); - -export const delPushManage = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); diff --git a/src/api/platform/common/controller/pushPassList.ts b/src/api/platform/common/controller/pushPassList.ts new file mode 100644 index 0000000..e1e63aa --- /dev/null +++ b/src/api/platform/common/controller/pushPassList.ts @@ -0,0 +1,25 @@ +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import type { PushPassList, PushPassListParams, PushPassListResult } from '/@/api/platform/common/entity/pushPassList'; +import { defHttp } from '/@/utils/http/axios'; + +enum Api { + list = '/common_proxy/common/pushPassList/list', + add = '/common_proxy/common/pushPassList/save', + get = '/common_proxy/common/pushPassList', + edit = '/common_proxy/common/pushPassList/update', + del = '/common_proxy/common/pushPassList/remove', +} + +export const listPushPassList = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); + +export const addPushPassList = (params: Partial) => defHttp.post({ url: Api.add, data: params }); + +export const editPushPassList = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); + +export const getPushPassList = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); + +export const delPushPassList = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); diff --git a/src/api/platform/common/controller/pushThirdParty.ts b/src/api/platform/common/controller/pushThirdParty.ts new file mode 100644 index 0000000..9dfb4ee --- /dev/null +++ b/src/api/platform/common/controller/pushThirdParty.ts @@ -0,0 +1,25 @@ +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import type { PushThirdParty, PushThirdPartyParams, PushThirdPartyResult } from '/@/api/platform/common/entity/pushThirdParty'; +import { defHttp } from '/@/utils/http/axios'; + +enum Api { + list = '/common_proxy/common/pushThirdParty/list', + add = '/common_proxy/common/pushThirdParty/save', + get = '/common_proxy/common/pushThirdParty', + edit = '/common_proxy/common/pushThirdParty/update', + del = '/common_proxy/common/pushThirdParty/remove', +} + +export const listPushThirdParty = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); + +export const addPushThirdParty = (params: Partial) => defHttp.post({ url: Api.add, data: params }); + +export const editPushThirdParty = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); + +export const getPushThirdParty = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); + +export const delPushThirdParty = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); diff --git a/src/api/platform/common/controller/pushThirdPartyManage.ts b/src/api/platform/common/controller/pushThirdPartyManage.ts new file mode 100644 index 0000000..9d57690 --- /dev/null +++ b/src/api/platform/common/controller/pushThirdPartyManage.ts @@ -0,0 +1,25 @@ +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import type { PushThirdPartyManage, PushThirdPartyManageParams, PushThirdPartyManageResult } from '/@/api/platform/common/entity/pushThirdPartyManage'; +import { defHttp } from '/@/utils/http/axios'; + +enum Api { + list = '/common_proxy/common/pushThirdPartyManage/list', + add = '/common_proxy/common/pushThirdPartyManage/save', + get = '/common_proxy/common/pushThirdPartyManage', + edit = '/common_proxy/common/pushThirdPartyManage/update', + del = '/common_proxy/common/pushThirdPartyManage/remove', +} + +export const listPushThirdPartyManage = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); + +export const addPushThirdPartyManage = (params: Partial) => defHttp.post({ url: Api.add, data: params }); + +export const editPushThirdPartyManage = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); + +export const getPushThirdPartyManage = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); + +export const delPushThirdPartyManage = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); diff --git a/src/api/platform/common/controller/pushTodoAuth.ts b/src/api/platform/common/controller/pushTodoAuth.ts deleted file mode 100644 index 268d10a..0000000 --- a/src/api/platform/common/controller/pushTodoAuth.ts +++ /dev/null @@ -1,25 +0,0 @@ -/** - * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 - * Copyright © 2020-2022 entfrm All rights reserved. - * author entfrm开发团队-王翔 - */ -import type { PushTodoAuth, PushTodoAuthParams, PushTodoAuthResult } from '/@/api/platform/common/entity/pushTodoAuth'; -import { defHttp } from '/@/utils/http/axios'; - -enum Api { - list = '/common_proxy/common/pushTodoAuth/list', - add = '/common_proxy/common/pushTodoAuth/save', - get = '/common_proxy/common/pushTodoAuth', - edit = '/common_proxy/common/pushTodoAuth/update', - del = '/common_proxy/common/pushTodoAuth/remove', -} - -export const listPushTodoAuth = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); - -export const addPushTodoAuth = (params: Partial) => defHttp.post({ url: Api.add, data: params }); - -export const editPushTodoAuth = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); - -export const getPushTodoAuth = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); - -export const delPushTodoAuth = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); diff --git a/src/api/platform/common/controller/pushType.ts b/src/api/platform/common/controller/pushType.ts deleted file mode 100644 index 1d0701f..0000000 --- a/src/api/platform/common/controller/pushType.ts +++ /dev/null @@ -1,25 +0,0 @@ -/** - * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 - * Copyright © 2020-2022 entfrm All rights reserved. - * author entfrm开发团队-王翔 - */ -import type { PushType, PushTypeParams, PushTypeResult } from '/@/api/platform/common/entity/pushType'; -import { defHttp } from '/@/utils/http/axios'; - -enum Api { - list = '/common_proxy/common/pushType/list', - add = '/common_proxy/common/pushType/save', - get = '/common_proxy/common/pushType', - edit = '/common_proxy/common/pushType/update', - del = '/common_proxy/common/pushType/remove', -} - -export const listPushType= (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); - -export const addPushType = (params: Partial) => defHttp.post({ url: Api.add, data: params }); - -export const editPushType = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); - -export const getPushType = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); - -export const delPushType = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); diff --git a/src/api/platform/common/controller/pushUserManage.ts b/src/api/platform/common/controller/pushUserManage.ts new file mode 100644 index 0000000..1c9e090 --- /dev/null +++ b/src/api/platform/common/controller/pushUserManage.ts @@ -0,0 +1,25 @@ +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import type { PushUserManage, PushUserManageParams, PushUserManageResult } from '/@/api/platform/common/entity/pushUserManage'; +import { defHttp } from '/@/utils/http/axios'; + +enum Api { + list = '/common_proxy/common/pushUserManage/list', + add = '/common_proxy/common/pushUserManage/save', + get = '/common_proxy/common/pushUserManage', + edit = '/common_proxy/common/pushUserManage/update', + del = '/common_proxy/common/pushUserManage/remove', +} + +export const listPushUserManage = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); + +export const addPushUserManage = (params: Partial) => defHttp.post({ url: Api.add, data: params }); + +export const editPushUserManage = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); + +export const getPushUserManage = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); + +export const delPushUserManage = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); diff --git a/src/api/platform/common/controller/pushWhitelist.ts b/src/api/platform/common/controller/pushWhitelist.ts deleted file mode 100644 index 4d67ff9..0000000 --- a/src/api/platform/common/controller/pushWhitelist.ts +++ /dev/null @@ -1,25 +0,0 @@ -/** - * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 - * Copyright © 2020-2022 entfrm All rights reserved. - * author entfrm开发团队-王翔 - */ -import type { PushWhitelist, PushWhitelistParams, PushWhitelistResult } from '/@/api/platform/common/entity/pushWhitelist'; -import { defHttp } from '/@/utils/http/axios'; - -enum Api { - list = '/common_proxy/common/pushWhitelist/list', - add = '/common_proxy/common/pushWhitelist/save', - get = '/common_proxy/common/pushWhitelist', - edit = '/common_proxy/common/pushWhitelist/update', - del = '/common_proxy/common/pushWhitelist/remove', -} - -export const listPushWhitelist = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); - -export const addPushWhitelist = (params: Partial) => defHttp.post({ url: Api.add, data: params }); - -export const editPushWhitelist = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); - -export const getPushWhitelist = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); - -export const delPushWhitelist = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); diff --git a/src/api/platform/common/entity/pushApplication.ts b/src/api/platform/common/entity/pushApplication.ts index 81eb189..e4798bc 100644 --- a/src/api/platform/common/entity/pushApplication.ts +++ b/src/api/platform/common/entity/pushApplication.ts @@ -6,11 +6,8 @@ export type PushApplicationParams = Page & PushApplication; export interface PushApplication extends CommonEntity { id: string; name: string; - pushSize: number; - sendSize: number; status: string; url: string; - appKey: string; messageSecret: string; } diff --git a/src/api/platform/common/entity/pushBlacklist.ts b/src/api/platform/common/entity/pushBlacklist.ts deleted file mode 100644 index 03b81f8..0000000 --- a/src/api/platform/common/entity/pushBlacklist.ts +++ /dev/null @@ -1,11 +0,0 @@ -import type { R } from '/#/axios'; -import type { CommonEntity, Page } from '/@/api/common/data/entity'; - -export type PushBlacklistParams = Page & PushBlacklist; - -export interface PushBlacklist extends CommonEntity { - id: string; - pushId: string; -} - -export type PushBlacklistResult = R; diff --git a/src/api/platform/common/entity/pushCertification.ts b/src/api/platform/common/entity/pushCertification.ts deleted file mode 100644 index 39a051b..0000000 --- a/src/api/platform/common/entity/pushCertification.ts +++ /dev/null @@ -1,21 +0,0 @@ -import type { R } from '/#/axios'; -import type { CommonEntity, Page } from '/@/api/common/data/entity'; - -export type PushCertificationParams = Page & PushCertification; - -export interface PushCertification extends CommonEntity { - id: string; - name: string; - license: string; - phone: string; - idCard: string; - contact: string; - creditCode: string; - type: string; - fileId: string; - status: string; - corpName: string; - detailedAddress: string; -} - -export type PushCertificationResult = R; diff --git a/src/api/platform/common/entity/pushCustomType.ts b/src/api/platform/common/entity/pushCustomType.ts new file mode 100644 index 0000000..b66d5d6 --- /dev/null +++ b/src/api/platform/common/entity/pushCustomType.ts @@ -0,0 +1,15 @@ +import type { R } from '/#/axios'; +import type { CommonEntity, Page } from '/@/api/common/data/entity'; + +export type PushCustomTypeParams = Page & PushCustomType; + +export interface PushCustomType extends CommonEntity { + id: string; + name: string; + level: string; + isVibration: string; + isSound: string; + customSound: string; +} + +export type PushCustomTypeResult = R; diff --git a/src/api/platform/common/entity/pushManage.ts b/src/api/platform/common/entity/pushManage.ts deleted file mode 100644 index 1f5ac63..0000000 --- a/src/api/platform/common/entity/pushManage.ts +++ /dev/null @@ -1,14 +0,0 @@ -import type { R } from '/#/axios'; -import type { CommonEntity, Page } from '/@/api/common/data/entity'; -import {TreeEntity} from "/@/api/common/data/entity"; - -export type PushManageParams = Page & PushManage; - -export interface PushManage extends TreeEntity { - isVibration: string; - isSound: string; - appKey: number; - customSound: number; -} - -export type PushManageResult = R; diff --git a/src/api/platform/common/entity/pushPassList.ts b/src/api/platform/common/entity/pushPassList.ts new file mode 100644 index 0000000..3049502 --- /dev/null +++ b/src/api/platform/common/entity/pushPassList.ts @@ -0,0 +1,13 @@ +import type { R } from '/#/axios'; +import type { CommonEntity, Page } from '/@/api/common/data/entity'; + +export type PushPassListParams = Page & PushPassList; + +export interface PushPassList extends CommonEntity { + id: string; + pushManageId: string; + name: string; + type: string; +} + +export type PushPassListResult = R; diff --git a/src/api/platform/common/entity/pushThirdParty.ts b/src/api/platform/common/entity/pushThirdParty.ts new file mode 100644 index 0000000..a76a7e3 --- /dev/null +++ b/src/api/platform/common/entity/pushThirdParty.ts @@ -0,0 +1,19 @@ +import type { R } from '/#/axios'; +import type { CommonEntity, Page } from '/@/api/common/data/entity'; + +export type PushThirdPartyParams = Page & PushThirdParty; + +export interface PushThirdParty extends CommonEntity { + id: string; + statutoryRepName: string; + idCard: string; + enterpName: string; + licenseFileId: string; + phone: string; + creditCode: string; + userId: string; + detailedAddress: string; + status: string; +} + +export type PushThirdPartyResult = R; diff --git a/src/api/platform/common/entity/pushThirdPartyManage.ts b/src/api/platform/common/entity/pushThirdPartyManage.ts new file mode 100644 index 0000000..16057d2 --- /dev/null +++ b/src/api/platform/common/entity/pushThirdPartyManage.ts @@ -0,0 +1,16 @@ +import type { R } from '/#/axios'; +import type { CommonEntity, Page } from '/@/api/common/data/entity'; + +export type PushThirdPartyManageParams = Page & PushThirdPartyManage; + +export interface PushThirdPartyManage extends CommonEntity { + id: string; + thirdPartyId: string; + enterpName: string; + pushTypeId: string; + isVibration: string; + isSound: string; + customSound: string; +} + +export type PushThirdPartyManageResult = R; diff --git a/src/api/platform/common/entity/pushTodoAuth.ts b/src/api/platform/common/entity/pushTodoAuth.ts deleted file mode 100644 index ec61f5a..0000000 --- a/src/api/platform/common/entity/pushTodoAuth.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { R } from '/#/axios'; -import type { CommonEntity, Page } from '/@/api/common/data/entity'; - -export type PushTodoAuthParams = Page & PushTodoAuth; - -export interface PushTodoAuth extends CommonEntity { - id: string; - name: string; - certificationId: string; - status: string; -} - -export type PushTodoAuthResult = R; diff --git a/src/api/platform/common/entity/pushType.ts b/src/api/platform/common/entity/pushType.ts deleted file mode 100644 index 6ae9d95..0000000 --- a/src/api/platform/common/entity/pushType.ts +++ /dev/null @@ -1,12 +0,0 @@ -import type { R } from '/#/axios'; -import type { CommonEntity, Page } from '/@/api/common/data/entity'; - -export type PushTypeParams = Page & PushType; - -export interface PushType extends CommonEntity { - id: string; - name: string; - level: string; -} - -export type PushTypeResult = R; diff --git a/src/api/platform/common/entity/pushUserManage.ts b/src/api/platform/common/entity/pushUserManage.ts new file mode 100644 index 0000000..3ce341e --- /dev/null +++ b/src/api/platform/common/entity/pushUserManage.ts @@ -0,0 +1,18 @@ +import type { R } from '/#/axios'; +import type { CommonEntity, Page } from '/@/api/common/data/entity'; + +export type PushUserManageParams = Page & PushUserManage; + +export interface PushUserManage extends CommonEntity { + id: string; + userId: string; + nickName: string; + sex: string; + avatar: string; + pushTypeId: string; + isVibration: string; + isSound: string; + customSound: string; +} + +export type PushUserManageResult = R; diff --git a/src/api/platform/common/entity/pushWhitelist.ts b/src/api/platform/common/entity/pushWhitelist.ts deleted file mode 100644 index a2539bf..0000000 --- a/src/api/platform/common/entity/pushWhitelist.ts +++ /dev/null @@ -1,11 +0,0 @@ -import type { R } from '/#/axios'; -import type { CommonEntity, Page } from '/@/api/common/data/entity'; - -export type PushWhitelistParams = Page & PushWhitelist; - -export interface PushWhitelist extends CommonEntity { - id: string; - pushId: string; -} - -export type PushWhitelistResult = R; diff --git a/src/views/common/push/application/application.data.ts b/src/views/common/push/application/application.data.ts index 30ee067..b4ec25a 100644 --- a/src/views/common/push/application/application.data.ts +++ b/src/views/common/push/application/application.data.ts @@ -6,19 +6,23 @@ import { Tag } from 'ant-design-vue'; /** 表格列配置 */ export const columns: BasicColumn[] = [ { - title: '多租户名称', + title: '应用名称', dataIndex: 'name' }, { - title: '创建推送数量', - dataIndex: 'pushSize' - }, - { - title: '消息发送数量', - dataIndex: 'sendSize' + title: '状态', + dataIndex: 'status', + width: 120, + customRender: ({record}) => { + const status = record.status; + const enable = ~~status === 0; + const color = enable ? 'green' : 'red'; + const text = enable ? '开通' : '关闭'; + return h(Tag, { color: color }, () => text); + } }, { - title: '请求地址', + title: '匹配域', dataIndex: 'url' }, { @@ -30,18 +34,6 @@ export const columns: BasicColumn[] = [ dataIndex: 'createTime', width: 200 }, - { - title: '状态', - dataIndex: 'status', - width: 120, - customRender: ({record}) => { - const status = record.status; - const enable = ~~status === 0; - const color = enable ? 'green' : 'red'; - const text = enable ? '启动' : '停止'; - return h(Tag, { color: color }, () => text); - } - }, { title: '备注', dataIndex: 'remarks', @@ -61,7 +53,7 @@ export const searchFormSchema: FormSchema[] = [ componentProps: { placeholder: '请输入应用名称', }, - colProps: { span: 8 } + colProps: { span: 6 } } ]; @@ -84,7 +76,7 @@ export const formSchema: FormSchema[] = [ }, { field: 'url', - label: '请求地址', + label: '匹配域', component: 'Input', required: true, colProps: { @@ -98,7 +90,7 @@ export const formSchema: FormSchema[] = [ defaultValue: '0', componentProps: { options: [ - { label: '启动', value: '0' }, + { label: '开通', value: '0' }, { label: '停止', value: '1' } ] }, diff --git a/src/views/common/push/blacklist/blacklist.data.ts b/src/views/common/push/blacklist/blacklist.data.ts deleted file mode 100644 index 9eb1dd8..0000000 --- a/src/views/common/push/blacklist/blacklist.data.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { BasicColumn } from '/@/components/Table'; -import { FormSchema } from '/@/components/Table'; -import { h } from 'vue'; -import { Tag } from 'ant-design-vue'; - -/** 表格列配置 */ -export const columns: BasicColumn[] = [ - { - title: '推送ID', - dataIndex: 'pushId' - }, - { - title: '创建人', - dataIndex: 'createByName' - }, - { - title: '创建时间', - dataIndex: 'createTime', - width: 200 - } -]; - -/** 搜索表单配置 */ -export const searchFormSchema: FormSchema[] = [ - { - field: 'createByName', - label: '创建人', - component: 'Input', - componentProps: { - placeholder: '请输入创建人', - }, - colProps: { span: 8 } - } -]; - -/** 表单配置 */ -export const formSchema: FormSchema[] = [ - { - field: 'id', - label: 'ID', - component: 'Input', - show: false - }, - { - field: 'pushId', - label: '推送ID', - component: 'Input', - required: true, - colProps: { - span: 24 - } - } -]; diff --git a/src/views/common/push/pushType/PushTypeModal.vue b/src/views/common/push/pushCustomType/CustomTypeModal.vue similarity index 87% rename from src/views/common/push/pushType/PushTypeModal.vue rename to src/views/common/push/pushCustomType/CustomTypeModal.vue index bc458e0..f2141ed 100644 --- a/src/views/common/push/pushType/PushTypeModal.vue +++ b/src/views/common/push/pushCustomType/CustomTypeModal.vue @@ -16,8 +16,8 @@ */ import { ref, unref } from 'vue'; import { BasicForm, useForm } from '/@/components/Form/index'; - import { formSchema } from './pushType.data'; - import { addPushType, editPushType, getPushType } from '/@/api/platform/common/controller/pushType'; + import { formSchema } from './customType.data'; + import { addPushCustomType, editPushCustomType, getPushCustomType } from '/@/api/platform/common/controller/pushCustomType'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; /** 通用变量统一声明区域 */ @@ -45,7 +45,7 @@ break; case 'edit': props.title = '编辑推送类型'; - await setFieldsValue(await getPushType(refId)); + await setFieldsValue(await getPushCustomType(refId)); break; } // 尾部:设置处理后的最终配置数据 @@ -62,10 +62,10 @@ // 采用tag标签区分操作 switch (unref(tag)) { case 'add': - await addPushType(formData); + await addPushCustomType(formData); break; case 'edit': - await editPushType(formData); + await editPushCustomType(formData); break; } // 处理提交完成之后逻辑 diff --git a/src/views/common/push/pushManage/pushManage.data.ts b/src/views/common/push/pushCustomType/customType.data.ts similarity index 55% rename from src/views/common/push/pushManage/pushManage.data.ts rename to src/views/common/push/pushCustomType/customType.data.ts index 00c38ae..e0f70d0 100644 --- a/src/views/common/push/pushManage/pushManage.data.ts +++ b/src/views/common/push/pushCustomType/customType.data.ts @@ -1,34 +1,24 @@ import { BasicColumn } from '/@/components/Table'; import { FormSchema } from '/@/components/Table'; -import { h } from 'vue'; -import { Tag } from 'ant-design-vue'; /** 表格列配置 */ export const columns: BasicColumn[] = [ { - title: '推送名称', - dataIndex: 'name', - align: 'left' + title: '类型名称', + dataIndex: 'name' }, { - title: '是否震动', - dataIndex: 'isVibration' + title: '紧急级别', + dataIndex: 'level' }, { - title: '是否声音', - dataIndex: 'isVibration' - }, - { - title: '自定义声音', - dataIndex: 'isVibration' - }, - { - title: '排序', - dataIndex: 'sort' + title: '创建人', + dataIndex: 'createByName' }, { title: '创建时间', - dataIndex: 'createTime' + dataIndex: 'createTime', + width: 200 } ]; @@ -36,12 +26,12 @@ export const columns: BasicColumn[] = [ export const searchFormSchema: FormSchema[] = [ { field: 'name', - label: '推送名称', + label: '类型名称', component: 'Input', componentProps: { - placeholder: '请输入推送名称' + placeholder: '请输入类型名称', }, - colProps: {span: 8} + colProps: { span: 6 } } ]; @@ -54,22 +44,17 @@ export const formSchema: FormSchema[] = [ show: false }, { - field: 'parentId', - label: '上级推送', - component: 'TreeSelect', - defaultValue: '0', - componentProps: { - replaceFields: { - title: 'name', - key: 'id', - value: 'id', - }, - getPopupContainer: () => document.body, + field: 'name', + label: '类型名称', + component: 'Input', + required: true, + colProps: { + span: 24 } }, { - field: 'name', - label: '推送名称', + field: 'level', + label: '紧急级别', component: 'Input', required: true, colProps: { @@ -79,7 +64,7 @@ export const formSchema: FormSchema[] = [ { field: 'isVibration', label: '是否震动', - component: 'Select', + component: 'RadioGroup', defaultValue: '0', componentProps: { options: [ @@ -87,12 +72,14 @@ export const formSchema: FormSchema[] = [ { label: '否', value: '1' } ] }, - colProps: { span: 12 } + colProps: { + span: 12 + } }, { field: 'isSound', - label: '是否声音', - component: 'Select', + label: '是否响铃', + component: 'RadioGroup', defaultValue: '0', componentProps: { options: [ @@ -100,15 +87,17 @@ export const formSchema: FormSchema[] = [ { label: '否', value: '1' } ] }, - colProps: { span: 12 } + colProps: { + span: 12 + } }, { field: 'customSound', - label: '自定义声音', + label: '自定义响铃', component: 'Input', required: true, colProps: { - span: 12 + span: 24 } - } + }, ]; diff --git a/src/views/common/push/pushType/index.vue b/src/views/common/push/pushCustomType/index.vue similarity index 94% rename from src/views/common/push/pushType/index.vue rename to src/views/common/push/pushCustomType/index.vue index 8ca5e26..4bcb80a 100644 --- a/src/views/common/push/pushType/index.vue +++ b/src/views/common/push/pushCustomType/index.vue @@ -46,10 +46,10 @@ */ import { reactive, toRaw } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; - import { listPushType, delPushType } from '/@/api/platform/common/controller/pushType'; + import { listPushCustomType, delPushCustomType } from '/@/api/platform/common/controller/pushCustomType'; import { useModal } from '/@/components/Modal'; import PushTypeModal from './PushTypeModal.vue'; - import { columns, searchFormSchema } from './pushType.data'; + import { columns, searchFormSchema } from './customType.data'; import { useMessage } from '/@/hooks/web/useMessage'; /** 类型规范统一声明定义区域 */ @@ -69,7 +69,7 @@ const [registerModal, { openModal }] = useModal(); const [registerTable, { reload, clearSelectedRowKeys, getSelectRowKeys }] = useTable({ title: '推送类型列表', - api: listPushType, + api: listPushCustomType, rowKey: 'id', columns, formConfig: { @@ -119,7 +119,7 @@ title: '警告', content: `是否确认删除编号为${ids}的数据?`, onOk: async () => { - await delPushType(ids); + await delPushCustomType(ids); createMessage.success('删除成功!'); handleRefreshTable(); } diff --git a/src/views/common/push/pushManage/PushManageModal.vue b/src/views/common/push/pushManage/PushManageModal.vue deleted file mode 100644 index bb48151..0000000 --- a/src/views/common/push/pushManage/PushManageModal.vue +++ /dev/null @@ -1,89 +0,0 @@ - - diff --git a/src/views/common/push/pushManage/index.vue b/src/views/common/push/pushManage/index.vue deleted file mode 100644 index f0b808f..0000000 --- a/src/views/common/push/pushManage/index.vue +++ /dev/null @@ -1,106 +0,0 @@ - - diff --git a/src/views/common/push/todoAuth/TodoAuthModal.vue b/src/views/common/push/pushPassList/PassListModal.vue similarity index 84% rename from src/views/common/push/todoAuth/TodoAuthModal.vue rename to src/views/common/push/pushPassList/PassListModal.vue index 108d74a..90cdbb5 100644 --- a/src/views/common/push/todoAuth/TodoAuthModal.vue +++ b/src/views/common/push/pushPassList/PassListModal.vue @@ -16,8 +16,8 @@ */ import { ref, unref } from 'vue'; import { BasicForm, useForm } from '/@/components/Form/index'; - import { formSchema } from './todoAuth.data'; - import { addPushTodoAuth, editPushTodoAuth, getPushTodoAuth } from '/@/api/platform/common/controller/pushTodoAuth'; + import { formSchema } from './passList.data'; + import { addPushPassList, editPushPassList, getPushPassList } from '/@/api/platform/common/controller/pushPassList'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; /** 通用变量统一声明区域 */ @@ -41,11 +41,11 @@ // 采用tag标签区分操作 switch (unref(tag)) { case 'add': - props.title = '新增认证代办'; + props.title = '新增名单'; break; case 'edit': - props.title = '编辑认证代办'; - await setFieldsValue(await getPushTodoAuth(refId)); + props.title = '编辑名单'; + await setFieldsValue(await getPushPassList(refId)); break; } // 尾部:设置处理后的最终配置数据 @@ -62,10 +62,10 @@ // 采用tag标签区分操作 switch (unref(tag)) { case 'add': - await addPushTodoAuth(formData); + await addPushPassList(formData); break; case 'edit': - await editPushTodoAuth(formData); + await editPushPassList(formData); break; } // 处理提交完成之后逻辑 diff --git a/src/views/common/push/todoAuth/index.vue b/src/views/common/push/pushPassList/index.vue similarity index 88% rename from src/views/common/push/todoAuth/index.vue rename to src/views/common/push/pushPassList/index.vue index 98856c5..2a3ee4e 100644 --- a/src/views/common/push/todoAuth/index.vue +++ b/src/views/common/push/pushPassList/index.vue @@ -6,15 +6,15 @@ @@ -46,10 +46,10 @@ */ import { reactive, toRaw } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; - import { listPushTodoAuth, delPushTodoAuth } from '/@/api/platform/common/controller/pushTodoAuth'; + import { listPushPassList, delPushPassList } from '/@/api/platform/common/controller/pushPassList'; import { useModal } from '/@/components/Modal'; - import TodoAuthModal from './TodoAuthModal.vue'; - import { columns, searchFormSchema } from './todoAuth.data'; + import PassListModal from './PassListModal.vue'; + import { columns, searchFormSchema } from './passList.data'; import { useMessage } from '/@/hooks/web/useMessage'; /** 类型规范统一声明定义区域 */ @@ -68,8 +68,8 @@ const { createConfirm, createMessage } = useMessage(); const [registerModal, { openModal }] = useModal(); const [registerTable, { reload, clearSelectedRowKeys, getSelectRowKeys }] = useTable({ - title: '代办列表', - api: listPushTodoAuth, + title: '名单列表', + api: listPushPassList, rowKey: 'id', columns, formConfig: { @@ -119,7 +119,7 @@ title: '警告', content: `是否确认删除编号为${ids}的数据?`, onOk: async () => { - await delPushTodoAuth(ids); + await delPushPassList(ids); createMessage.success('删除成功!'); handleRefreshTable(); } diff --git a/src/views/common/push/pushType/pushType.data.ts b/src/views/common/push/pushPassList/passList.data.ts similarity index 72% rename from src/views/common/push/pushType/pushType.data.ts rename to src/views/common/push/pushPassList/passList.data.ts index 1b074a3..5cb3ae8 100644 --- a/src/views/common/push/pushType/pushType.data.ts +++ b/src/views/common/push/pushPassList/passList.data.ts @@ -1,17 +1,15 @@ import { BasicColumn } from '/@/components/Table'; import { FormSchema } from '/@/components/Table'; -import { h } from 'vue'; -import { Tag } from 'ant-design-vue'; /** 表格列配置 */ export const columns: BasicColumn[] = [ { - title: '类型名称', + title: '推送名称', dataIndex: 'name' }, { - title: '紧急级别', - dataIndex: 'level' + title: '推送ID', + dataIndex: 'pushManageId' }, { title: '创建人', @@ -28,12 +26,12 @@ export const columns: BasicColumn[] = [ export const searchFormSchema: FormSchema[] = [ { field: 'name', - label: '类型名称', + label: '推送名称', component: 'Input', componentProps: { - placeholder: '请输入类型名称', + placeholder: '请输入推送名称', }, - colProps: { span: 8 } + colProps: { span: 6 } } ]; @@ -47,7 +45,7 @@ export const formSchema: FormSchema[] = [ }, { field: 'name', - label: '类型名称', + label: '推送名称', component: 'Input', required: true, colProps: { @@ -55,12 +53,12 @@ export const formSchema: FormSchema[] = [ } }, { - field: 'level', - label: '紧急级别', + field: 'pushManageId', + label: '推送ID', component: 'Input', required: true, colProps: { - span: 12 + span: 24 } } ]; diff --git a/src/views/common/push/blacklist/BlacklistModal.vue b/src/views/common/push/pushThirdParty/ThirdPartyModal.vue similarity index 83% rename from src/views/common/push/blacklist/BlacklistModal.vue rename to src/views/common/push/pushThirdParty/ThirdPartyModal.vue index f93b91b..4167559 100644 --- a/src/views/common/push/blacklist/BlacklistModal.vue +++ b/src/views/common/push/pushThirdParty/ThirdPartyModal.vue @@ -1,4 +1,4 @@ -