This commit is contained in:
@@ -13,9 +13,9 @@ export default {
|
|||||||
// 如果需要自定义本地开发服务器 请取消注释按需调整
|
// 如果需要自定义本地开发服务器 请取消注释按需调整
|
||||||
dev: {
|
dev: {
|
||||||
// localhost:8000/api/** -> https://preview.pro.ant.design/api/**
|
// localhost:8000/api/** -> https://preview.pro.ant.design/api/**
|
||||||
"/admin-api/": {
|
'/admin-api/': {
|
||||||
// 要代理的地址
|
// 要代理的地址
|
||||||
target: "http://192.168.1.114:48080",
|
target: 'http://114.132.60.20:48080',
|
||||||
// 配置了这个可以从 http 代理到 https
|
// 配置了这个可以从 http 代理到 https
|
||||||
// 依赖 origin 的功能可能需要这个,比如 cookie
|
// 依赖 origin 的功能可能需要这个,比如 cookie
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
@@ -27,17 +27,17 @@ export default {
|
|||||||
*/
|
*/
|
||||||
test: {
|
test: {
|
||||||
// localhost:8000/api/** -> https://preview.pro.ant.design/api/**
|
// localhost:8000/api/** -> https://preview.pro.ant.design/api/**
|
||||||
"/api/": {
|
'/api/': {
|
||||||
target: "https://proapi.azurewebsites.net",
|
target: 'https://proapi.azurewebsites.net',
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
pathRewrite: { "^": "" },
|
pathRewrite: { '^': '' },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
pre: {
|
pre: {
|
||||||
"/api/": {
|
'/api/': {
|
||||||
target: "your pre url",
|
target: 'your pre url',
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
pathRewrite: { "^": "" },
|
pathRewrite: { '^': '' },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import type {
|
|||||||
ProColumns,
|
ProColumns,
|
||||||
ProDescriptionsItemProps,
|
ProDescriptionsItemProps,
|
||||||
} from '@ant-design/pro-components';
|
} from '@ant-design/pro-components';
|
||||||
|
import { Space, Tag } from 'antd';
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
import type { SmsLogVO } from '@/services/system/message/sms/log';
|
import type { SmsLogVO } from '@/services/system/message/sms/log';
|
||||||
export const baseTenantColumns: ProColumns<SmsLogVO>[] = [
|
export const baseTenantColumns: ProColumns<SmsLogVO>[] = [
|
||||||
@@ -11,6 +12,26 @@ export const baseTenantColumns: ProColumns<SmsLogVO>[] = [
|
|||||||
width: 100,
|
width: 100,
|
||||||
hideInSearch: true, // 在搜索表单中隐藏
|
hideInSearch: true, // 在搜索表单中隐藏
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: '创建时间',
|
||||||
|
dataIndex: 'createTime',
|
||||||
|
valueType: 'dateRange',
|
||||||
|
hideInSearch: true,
|
||||||
|
search: {
|
||||||
|
transform: (value) => {
|
||||||
|
return {
|
||||||
|
[`createTime[0]`]: dayjs(value[0])
|
||||||
|
.startOf('day')
|
||||||
|
.format('YYYY-MM-DD HH:mm:ss'),
|
||||||
|
[`createTime[1]`]: dayjs(value[1])
|
||||||
|
.endOf('day')
|
||||||
|
.format('YYYY-MM-DD HH:mm:ss'),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
},
|
||||||
|
render: (_, record: SmsLogVO) =>
|
||||||
|
dayjs(record.createTime).format('YYYY-MM-DD HH:mm:ss'),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: '手机号',
|
title: '手机号',
|
||||||
dataIndex: 'mobile',
|
dataIndex: 'mobile',
|
||||||
@@ -24,11 +45,6 @@ export const baseTenantColumns: ProColumns<SmsLogVO>[] = [
|
|||||||
title: '发送状态',
|
title: '发送状态',
|
||||||
dataIndex: 'sendStatus',
|
dataIndex: 'sendStatus',
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: '发送人名称',
|
|
||||||
dataIndex: 'templateNickname',
|
|
||||||
hideInSearch: true, // 在搜索表单中隐藏
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
{
|
||||||
title: '接收状态',
|
title: '接收状态',
|
||||||
@@ -48,10 +64,10 @@ export const baseTenantColumns: ProColumns<SmsLogVO>[] = [
|
|||||||
hideInSearch: true,
|
hideInSearch: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '创建时间',
|
title: '发送时间',
|
||||||
dataIndex: 'createTime',
|
dataIndex: 'sendTime',
|
||||||
valueType: 'dateRange',
|
valueType: 'dateRange',
|
||||||
hideInSearch: true,
|
hideInTable: true,
|
||||||
search: {
|
search: {
|
||||||
transform: (value) => {
|
transform: (value) => {
|
||||||
return {
|
return {
|
||||||
@@ -117,6 +133,16 @@ export const descriptionsColumns = (): ProDescriptionsItemProps<
|
|||||||
title: '用户信息',
|
title: '用户信息',
|
||||||
key: 'mobile',
|
key: 'mobile',
|
||||||
dataIndex: 'mobile',
|
dataIndex: 'mobile',
|
||||||
|
render(dom, record) {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Space>
|
||||||
|
<Tag>{record.mobile}</Tag>
|
||||||
|
{record.userId && <Tag>{record.userId}</Tag>}
|
||||||
|
</Space>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '短信内容',
|
title: '短信内容',
|
||||||
|
|||||||
Reference in New Issue
Block a user