feat: mock数据完善

develop
donghao 1 year ago
parent a9134e7bf3
commit 70dab765df

@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-01-25 16:53:15
* @LastEditors: donghao donghao@supervision.ltd
* @LastEditTime: 2024-01-25 17:40:01
* @LastEditTime: 2024-02-05 15:24:11
* @FilePath: \general-ai-platform-web\mock\deviceCategory.ts
* @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@ -10,6 +10,9 @@
/**设备组模块 mock */
import {
mockGetDeviceGroupData1,
mockGetDeviceGroupData2,
mockGetDeviceGroupData3,
mockGetDeviceGroupFkSelectData,
mockGetDeviceGroupListData,
mockGetDeviceGroupTreeData,
@ -22,6 +25,7 @@ export default {
const { page, pageSize } = req.body;
const resData: successMockApiProps = {
...fetchCurrPageByList({
...mockGetDeviceGroupListData,
data: { ...mockGetDeviceGroupListData.data, page, pageSize: pageSize || 10 },
@ -30,7 +34,7 @@ export default {
res.send(resData);
},
// 设备组网点选项列表
// 设备组网点选项列表
'POST /api/v1/device_group/getDeviceGroupFkSelect': async (req: Request, res: Response) => {
const resData: successMockApiProps = {
...fetchMockSuccessFullByOther(mockGetDeviceGroupFkSelectData),
@ -44,4 +48,25 @@ export default {
};
res.send(resData);
},
// 设备组详情
'POST /api/v1/device_group/getDeviceGroupById': async (req: Request, res: Response) => {
const { id } = req.body;
let currRes = {};
switch (Number(id)) {
case 2:
currRes = mockGetDeviceGroupData1;
break;
case 3:
currRes = mockGetDeviceGroupData2;
break;
case 5:
currRes = mockGetDeviceGroupData3;
break;
}
const resData: successMockApiProps = {
...fetchMockSuccessFullByOther(currRes),
};
res.send(resData);
},
};

File diff suppressed because it is too large Load Diff

@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-01-25 16:32:31
* @LastEditors: donghao donghao@supervision.ltd
* @LastEditTime: 2024-01-25 17:33:13
* @LastEditTime: 2024-02-05 15:21:21
* @FilePath: \general-ai-platform-web\mock\pools\deviceGroupData.ts
* @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@ -172,3 +172,71 @@ export const mockGetDeviceGroupListData = {
pageSize: 10,
},
};
// 设备组详情
export const mockGetDeviceGroupData1 = {
data: {
deviceGroup: {
id: 2,
createTime: '2023-10-17T13:37:31.758471+08:00',
updateTime: '2023-10-17T13:39:31.530494+08:00',
name: '秦淮网点',
code: 'DG00003',
address: '江苏省南京市秦淮区中山南路79号',
telephone: '',
lon: '118.791819',
lat: '32.045002',
managerName: '',
managerPhone: '',
isEnable: true,
parentFkId: 1,
remark: '',
children: null,
key: '',
},
},
};
export const mockGetDeviceGroupData2 = {
data: {
deviceGroup: {
id: 3,
createTime: '2023-10-17T13:40:28.823372+08:00',
updateTime: '2023-10-17T13:40:28.823372+08:00',
name: '江宁网点',
code: 'DG00004',
address: '江苏省南京市经济技术开发区双龙大道1680号',
telephone: '',
lon: '118.824682',
lat: '31.937062',
managerName: '',
managerPhone: '',
isEnable: true,
parentFkId: 1,
remark: '',
children: null,
key: '',
},
},
};
export const mockGetDeviceGroupData3 = {
data: {
deviceGroup: {
id: 5,
createTime: '2023-10-17T15:05:13.542992+08:00',
updateTime: '2023-10-17T15:08:01.071315+08:00',
name: '合肥网点',
code: 'DG00006',
address: '安徽省合肥市包河区马鞍山路130号',
telephone: '',
lon: '117.309214',
lat: '31.862594',
managerName: '',
managerPhone: '',
isEnable: true,
parentFkId: 4,
remark: '',
children: null,
key: '',
},
},
};

@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-01-25 16:43:31
* @LastEditors: donghao donghao@supervision.ltd
* @LastEditTime: 2024-01-25 17:43:43
* @LastEditTime: 2024-02-05 15:24:57
* @FilePath: \general-ai-platform-web\mock\pools\projectData.ts
* @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@ -485,3 +485,30 @@ export const mockGetProjectListData = {
pageSize: 10,
},
};
// 项目详情通过设备组
export const mockGetProjectByGroupIdData = {
data: {
list: [
{
name: '测试3334',
id: 65,
models: [
{
modelName: '玩手机yolo2',
version: 'V1.0',
configId: 2,
updateTime: '2023-12-28 13:57:29',
},
{
modelName: '玩手机yolo2',
version: 'V1.0',
configId: 1,
updateTime: '2023-12-28 13:57:52',
},
],
},
],
}
};

@ -2,13 +2,13 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-01-25 14:07:33
* @LastEditors: donghao donghao@supervision.ltd
* @LastEditTime: 2024-01-25 17:43:22
* @LastEditTime: 2024-02-05 15:13:31
* @FilePath: \general-ai-platform-web\mock\project.ts
* @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
/**项目模块 mock */
import { mockGetProjectFkSelectData, mockGetProjectListData } from './pools/projectData';
import { mockGetProjectFkSelectData, mockGetProjectListData, mockGetProjectByGroupIdData } from './pools/projectData';
import { successMockApiProps } from './typing';
import { fetchCurrPageByList, fetchMockSuccessFullByOther } from './utils/apiMock';
export default {
@ -32,4 +32,12 @@ export default {
};
res.send(resData);
},
// 项目列表by设备组
'POST /api/v1/project/getProjectByGroupId': async (req: Request, res: Response) => {
const resData: successMockApiProps = {
...fetchMockSuccessFullByOther(mockGetProjectByGroupIdData),
};
res.send(resData);
},
};

@ -147,66 +147,66 @@ const AlgorithmModelList: React.FC = () => {
);
},
},
{
title: (
<FormattedMessage
id="resource.algorithm_model.table.list.categoryFkId"
defaultMessage="$$$"
/>
),
dataIndex: 'categoryFkId',
hideInSearch: false,
render: (text, record) => {
if (category_fk_id_column_open) {
return (
<a
onClick={() => {
handle_category_fk_id(record.categoryFkId);
}}
>
{record?.categoryFkId ? categoryFkIdMap[record.categoryFkId] : undefined}
</a>
);
} else {
return (
<a
onClick={() => {
handle_category_fk_id(record.categoryFkId);
}}
>
{record.categoryFkId}
</a>
);
}
},
renderFormItem: () => {
return (
// value 和 onchange 会通过 form 自动注入。
<ProFormSelect
labelAlign="left"
wrapperCol={{ flex: 1 }}
placeholder={`${intl.formatMessage({
id: 'common.please_select',
defaultMessage: '$$$',
})}`}
required={false}
showSearch
debounceTime={1000}
request={async (keyWord) => {
const resp = await postModelCategoryGetModelCategoryFkSelect({
keyword: keyWord?.keyWords || '',
});
return resp.data.list.map((v: any) => {
return {
label: v.name,
value: v.id,
};
});
}}
/>
);
},
},
// {
// title: (
// <FormattedMessage
// id="resource.algorithm_model.table.list.categoryFkId"
// defaultMessage="$$$"
// />
// ),
// dataIndex: 'categoryFkId',
// hideInSearch: false,
// render: (text, record) => {
// if (category_fk_id_column_open) {
// return (
// <a
// onClick={() => {
// handle_category_fk_id(record.categoryFkId);
// }}
// >
// {record?.categoryFkId ? categoryFkIdMap[record.categoryFkId] : undefined}
// </a>
// );
// } else {
// return (
// <a
// onClick={() => {
// handle_category_fk_id(record.categoryFkId);
// }}
// >
// {record.categoryFkId}
// </a>
// );
// }
// },
// renderFormItem: () => {
// return (
// // value 和 onchange 会通过 form 自动注入。
// <ProFormSelect
// labelAlign="left"
// wrapperCol={{ flex: 1 }}
// placeholder={`${intl.formatMessage({
// id: 'common.please_select',
// defaultMessage: '$$$',
// })}`}
// required={false}
// showSearch
// debounceTime={1000}
// request={async (keyWord) => {
// const resp = await postModelCategoryGetModelCategoryFkSelect({
// keyword: keyWord?.keyWords || '',
// });
// return resp.data.list.map((v: any) => {
// return {
// label: v.name,
// value: v.id,
// };
// });
// }}
// />
// );
// },
// },
{
title: (
<FormattedMessage
@ -366,7 +366,7 @@ const AlgorithmModelList: React.FC = () => {
accessible={access.canUpdate(history.location.pathname)}
key={`${history.location.pathname}-add`}
>
<Button
{/* <Button
type="primary"
key="category_fk_id_show"
onClick={() => {
@ -382,7 +382,7 @@ const AlgorithmModelList: React.FC = () => {
id="resource.algorithm_model.table.list.categoryFkId"
defaultMessage="$$$"
/>
</Button>
</Button> */}
<Button
type="primary"

Loading…
Cancel
Save