更新接口调用
This commit is contained in:
parent
afeb8fcaee
commit
0a1bffe8f8
@ -1266,9 +1266,9 @@ export const DeviceTableModelDataInfoPageInputSchema = {
|
|||||||
</example>`,
|
</example>`,
|
||||||
nullable: true
|
nullable: true
|
||||||
},
|
},
|
||||||
systemName: {
|
dataBaseName: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
description: '系统名称',
|
description: '数据库名称',
|
||||||
nullable: true
|
nullable: true
|
||||||
},
|
},
|
||||||
ioTDataType: {
|
ioTDataType: {
|
||||||
@ -1304,7 +1304,7 @@ export const DeviceTableModelDataInfoPageInputSchema = {
|
|||||||
export const DeviceTableModelDataInfoPageOutputSchema = {
|
export const DeviceTableModelDataInfoPageOutputSchema = {
|
||||||
type: 'object',
|
type: 'object',
|
||||||
properties: {
|
properties: {
|
||||||
systemName: {
|
dataBaseName: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
description: '系统名称',
|
description: '系统名称',
|
||||||
nullable: true
|
nullable: true
|
||||||
@ -1390,9 +1390,9 @@ export const DeviceTreeModelDataInfoInputSchema = {
|
|||||||
</example>`,
|
</example>`,
|
||||||
nullable: true
|
nullable: true
|
||||||
},
|
},
|
||||||
systemName: {
|
dataBaseName: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
description: '系统名称',
|
description: '数据库名称',
|
||||||
nullable: true
|
nullable: true
|
||||||
},
|
},
|
||||||
ioTDataType: {
|
ioTDataType: {
|
||||||
@ -3764,9 +3764,9 @@ export const MeterReadingPacketInfoPageInputSchema = {
|
|||||||
</example>`,
|
</example>`,
|
||||||
nullable: true
|
nullable: true
|
||||||
},
|
},
|
||||||
systemName: {
|
dataBaseName: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
description: '系统名称',
|
description: '数据库名称',
|
||||||
nullable: true
|
nullable: true
|
||||||
},
|
},
|
||||||
ioTDataType: {
|
ioTDataType: {
|
||||||
@ -7033,9 +7033,9 @@ export const QueryCTWingAepReceiveMessageInputSchema = {
|
|||||||
</example>`,
|
</example>`,
|
||||||
nullable: true
|
nullable: true
|
||||||
},
|
},
|
||||||
systemName: {
|
dataBaseName: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
description: '系统名称',
|
description: '数据库名称',
|
||||||
nullable: true
|
nullable: true
|
||||||
},
|
},
|
||||||
ioTDataType: {
|
ioTDataType: {
|
||||||
@ -7229,9 +7229,9 @@ export const QueryOneNETReceiveMessageInputSchema = {
|
|||||||
</example>`,
|
</example>`,
|
||||||
nullable: true
|
nullable: true
|
||||||
},
|
},
|
||||||
systemName: {
|
dataBaseName: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
description: '系统名称',
|
description: '数据库名称',
|
||||||
nullable: true
|
nullable: true
|
||||||
},
|
},
|
||||||
ioTDataType: {
|
ioTDataType: {
|
||||||
@ -8383,4 +8383,4 @@ export const WindowsTimeZoneSchema = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
} as const;
|
} as const;
|
||||||
|
|||||||
@ -588,9 +588,9 @@ export type DeviceTableModelDataInfoPageInput = {
|
|||||||
*/
|
*/
|
||||||
sorting?: (string) | null;
|
sorting?: (string) | null;
|
||||||
/**
|
/**
|
||||||
* 系统名称
|
* 数据库名称
|
||||||
*/
|
*/
|
||||||
systemName?: (string) | null;
|
dataBaseName?: (string) | null;
|
||||||
/**
|
/**
|
||||||
* 数据类型
|
* 数据类型
|
||||||
*/
|
*/
|
||||||
@ -617,7 +617,7 @@ export type DeviceTableModelDataInfoPageOutput = {
|
|||||||
/**
|
/**
|
||||||
* 系统名称
|
* 系统名称
|
||||||
*/
|
*/
|
||||||
systemName?: (string) | null;
|
dataBaseName?: (string) | null;
|
||||||
/**
|
/**
|
||||||
* 数据类型
|
* 数据类型
|
||||||
*/
|
*/
|
||||||
@ -673,9 +673,9 @@ export type DeviceTreeModelDataInfoInput = {
|
|||||||
*/
|
*/
|
||||||
sorting?: (string) | null;
|
sorting?: (string) | null;
|
||||||
/**
|
/**
|
||||||
* 系统名称
|
* 数据库名称
|
||||||
*/
|
*/
|
||||||
systemName?: (string) | null;
|
dataBaseName?: (string) | null;
|
||||||
/**
|
/**
|
||||||
* 数据类型
|
* 数据类型
|
||||||
*/
|
*/
|
||||||
@ -1662,9 +1662,9 @@ export type MeterReadingPacketInfoPageInput = {
|
|||||||
*/
|
*/
|
||||||
sorting?: (string) | null;
|
sorting?: (string) | null;
|
||||||
/**
|
/**
|
||||||
* 系统名称
|
* 数据库名称
|
||||||
*/
|
*/
|
||||||
systemName?: (string) | null;
|
dataBaseName?: (string) | null;
|
||||||
/**
|
/**
|
||||||
* 数据类型
|
* 数据类型
|
||||||
*/
|
*/
|
||||||
@ -3534,9 +3534,9 @@ export type QueryCTWingAepReceiveMessageInput = {
|
|||||||
*/
|
*/
|
||||||
sorting?: (string) | null;
|
sorting?: (string) | null;
|
||||||
/**
|
/**
|
||||||
* 系统名称
|
* 数据库名称
|
||||||
*/
|
*/
|
||||||
systemName?: (string) | null;
|
dataBaseName?: (string) | null;
|
||||||
/**
|
/**
|
||||||
* 数据类型
|
* 数据类型
|
||||||
*/
|
*/
|
||||||
@ -3677,9 +3677,9 @@ export type QueryOneNETReceiveMessageInput = {
|
|||||||
*/
|
*/
|
||||||
sorting?: (string) | null;
|
sorting?: (string) | null;
|
||||||
/**
|
/**
|
||||||
* 系统名称
|
* 数据库名称
|
||||||
*/
|
*/
|
||||||
systemName?: (string) | null;
|
dataBaseName?: (string) | null;
|
||||||
/**
|
/**
|
||||||
* 数据类型
|
* 数据类型
|
||||||
*/
|
*/
|
||||||
@ -5084,23 +5084,27 @@ export type PostTableModelPacketInfoPageData = {
|
|||||||
|
|
||||||
export type PostTableModelPacketInfoPageResponse = (MeterReadingPacketInfoPageOutputPagedResultDto);
|
export type PostTableModelPacketInfoPageResponse = (MeterReadingPacketInfoPageOutputPagedResultDto);
|
||||||
|
|
||||||
export type PostTableModelPacketInfoPageError = (RemoteServiceErrorResponse);
|
export type PostTableModelPacketInfoPageError = unknown;
|
||||||
|
|
||||||
export type PostTableModelPacketInfoInsertData = {
|
export type PostTableModelPacketInfoInsertData = {
|
||||||
body?: MeterReadingPacketInfoDto;
|
query?: {
|
||||||
|
input?: MeterReadingPacketInfoDto;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export type PostTableModelPacketInfoInsertResponse = (unknown);
|
export type PostTableModelPacketInfoInsertResponse = (unknown);
|
||||||
|
|
||||||
export type PostTableModelPacketInfoInsertError = (RemoteServiceErrorResponse);
|
export type PostTableModelPacketInfoInsertError = unknown;
|
||||||
|
|
||||||
export type PostTableModelPacketInfoBatchInsertData = {
|
export type PostTableModelPacketInfoBatchInsertData = {
|
||||||
body?: Array<MeterReadingPacketInfoDto>;
|
query?: {
|
||||||
|
input?: Array<MeterReadingPacketInfoDto>;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export type PostTableModelPacketInfoBatchInsertResponse = (unknown);
|
export type PostTableModelPacketInfoBatchInsertResponse = (unknown);
|
||||||
|
|
||||||
export type PostTableModelPacketInfoBatchInsertError = (RemoteServiceErrorResponse);
|
export type PostTableModelPacketInfoBatchInsertError = unknown;
|
||||||
|
|
||||||
export type PostTableModelDeviceDataInfoPageData = {
|
export type PostTableModelDeviceDataInfoPageData = {
|
||||||
body?: DeviceTableModelDataInfoPageInput;
|
body?: DeviceTableModelDataInfoPageInput;
|
||||||
@ -5108,23 +5112,27 @@ export type PostTableModelDeviceDataInfoPageData = {
|
|||||||
|
|
||||||
export type PostTableModelDeviceDataInfoPageResponse = (DeviceTableModelDataInfoPageOutputPagedResultDto);
|
export type PostTableModelDeviceDataInfoPageResponse = (DeviceTableModelDataInfoPageOutputPagedResultDto);
|
||||||
|
|
||||||
export type PostTableModelDeviceDataInfoPageError = (RemoteServiceErrorResponse);
|
export type PostTableModelDeviceDataInfoPageError = unknown;
|
||||||
|
|
||||||
export type PostTableModelCtWingLogInfoData = {
|
export type PostTableModelCtWingLogInfoData = {
|
||||||
body?: QueryCTWingAepReceiveMessageInput;
|
query?: {
|
||||||
|
input?: QueryCTWingAepReceiveMessageInput;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export type PostTableModelCtWingLogInfoResponse = (QueryCTWingAepReceiveMessageOutputPagedResultDto);
|
export type PostTableModelCtWingLogInfoResponse = (QueryCTWingAepReceiveMessageOutputPagedResultDto);
|
||||||
|
|
||||||
export type PostTableModelCtWingLogInfoError = (RemoteServiceErrorResponse);
|
export type PostTableModelCtWingLogInfoError = unknown;
|
||||||
|
|
||||||
export type PostTableModelOneNetLogInfoData = {
|
export type PostTableModelOneNetLogInfoData = {
|
||||||
body?: QueryOneNETReceiveMessageInput;
|
query?: {
|
||||||
|
input?: QueryOneNETReceiveMessageInput;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export type PostTableModelOneNetLogInfoResponse = (QueryOneNETReceiveMessageOutputPagedResultDto);
|
export type PostTableModelOneNetLogInfoResponse = (QueryOneNETReceiveMessageOutputPagedResultDto);
|
||||||
|
|
||||||
export type PostTableModelOneNetLogInfoError = (RemoteServiceErrorResponse);
|
export type PostTableModelOneNetLogInfoError = unknown;
|
||||||
|
|
||||||
export type PostTenantsFindData = {
|
export type PostTenantsFindData = {
|
||||||
body?: FindTenantByNameInput;
|
body?: FindTenantByNameInput;
|
||||||
@ -5366,4 +5374,4 @@ export type PostUsersResetTwoFactorError = (RemoteServiceErrorResponse);
|
|||||||
|
|
||||||
export type PostUsersNeedChangePasswordResponse = (NeedChangePasswordOutput);
|
export type PostUsersNeedChangePasswordResponse = (NeedChangePasswordOutput);
|
||||||
|
|
||||||
export type PostUsersNeedChangePasswordError = (RemoteServiceErrorResponse);
|
export type PostUsersNeedChangePasswordError = (RemoteServiceErrorResponse);
|
||||||
|
|||||||
@ -77,7 +77,7 @@
|
|||||||
"loginMode": "Login Method",
|
"loginMode": "Login Method",
|
||||||
"loginUrl": "Login URL",
|
"loginUrl": "Login URL",
|
||||||
"detail": "Details",
|
"detail": "Details",
|
||||||
"systemName": "System Name",
|
"dataBaseName": "Database Name",
|
||||||
"projectId": "Project ID",
|
"projectId": "Project ID",
|
||||||
"dataType": "Data Type",
|
"dataType": "Data Type",
|
||||||
"deviceType": "Device Type",
|
"deviceType": "Device Type",
|
||||||
@ -210,6 +210,7 @@
|
|||||||
},
|
},
|
||||||
"IoTDBBase": {
|
"IoTDBBase": {
|
||||||
"IoTDataType": "IoTDataType",
|
"IoTDataType": "IoTDataType",
|
||||||
|
"DataBaseName": "DataBaseName",
|
||||||
"DeviceType": "DeviceType",
|
"DeviceType": "DeviceType",
|
||||||
"Timestamps": "Timestamps",
|
"Timestamps": "Timestamps",
|
||||||
"FormattedTimestamps": "Formatted Timestamps",
|
"FormattedTimestamps": "Formatted Timestamps",
|
||||||
|
|||||||
@ -77,7 +77,7 @@
|
|||||||
"loginMode": "登录方式",
|
"loginMode": "登录方式",
|
||||||
"loginUrl": "登录地址",
|
"loginUrl": "登录地址",
|
||||||
"detail": "详情",
|
"detail": "详情",
|
||||||
"systemName": "系统名称",
|
"dataBaseName": "数据库名称",
|
||||||
"projectId": "项目编码",
|
"projectId": "项目编码",
|
||||||
"dataType": "数据类型",
|
"dataType": "数据类型",
|
||||||
"deviceType": "设备类型",
|
"deviceType": "设备类型",
|
||||||
@ -210,6 +210,7 @@
|
|||||||
},
|
},
|
||||||
"IoTDBBase": {
|
"IoTDBBase": {
|
||||||
"IoTDataType": "数据类型",
|
"IoTDataType": "数据类型",
|
||||||
|
"DataBaseName": "所属数据库",
|
||||||
"DeviceType": "设备类型",
|
"DeviceType": "设备类型",
|
||||||
"Timestamps": "时标(纳秒)",
|
"Timestamps": "时标(纳秒)",
|
||||||
"FormattedTimestamps": "时标",
|
"FormattedTimestamps": "时标",
|
||||||
|
|||||||
@ -184,7 +184,7 @@ const toStatusData = (row: Record<string, any>) => {
|
|||||||
DeviceType: row.meterType,
|
DeviceType: row.meterType,
|
||||||
DeviceId: row.meterId,
|
DeviceId: row.meterId,
|
||||||
FocusAddress: row.focusAddress,
|
FocusAddress: row.focusAddress,
|
||||||
SystemName: row.businessSystemName,
|
DataBaseName: row.businessSystemName,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@ -21,7 +21,7 @@ CTWing日志管理页面用于查看和管理CTWing物联网平台的设备数
|
|||||||
DeviceType?: string, // 设备类型
|
DeviceType?: string, // 设备类型
|
||||||
DeviceId?: string, // 设备ID
|
DeviceId?: string, // 设备ID
|
||||||
FocusAddress?: string, // 集中器地址
|
FocusAddress?: string, // 集中器地址
|
||||||
SystemName?: string, // 系统名称
|
DataBaseName?: string, // 数据库名称
|
||||||
ProjectId?: string // 项目ID
|
ProjectId?: string // 项目ID
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
@ -32,7 +32,7 @@ CTWing日志管理页面用于查看和管理CTWing物联网平台的设备数
|
|||||||
{
|
{
|
||||||
items: [
|
items: [
|
||||||
{
|
{
|
||||||
systemName: string, // 系统名称
|
dataBaseName: string, // 数据库名称
|
||||||
projectId: string, // 项目ID
|
projectId: string, // 项目ID
|
||||||
dataType: string, // 数据类型
|
dataType: string, // 数据类型
|
||||||
deviceType: string, // 设备类型
|
deviceType: string, // 设备类型
|
||||||
@ -74,7 +74,7 @@ CTWing日志管理页面用于查看和管理CTWing物联网平台的设备数
|
|||||||
|
|
||||||
| 字段名 | 显示名称 | 说明 |
|
| 字段名 | 显示名称 | 说明 |
|
||||||
| ---------------- | ---------- | ------------------ |
|
| ---------------- | ---------- | ------------------ |
|
||||||
| systemName | 系统名称 | 所属系统 |
|
| dataBaseName | 数据库名称 | 所属数据库 |
|
||||||
| projectId | 项目编码 | 项目标识 |
|
| projectId | 项目编码 | 项目标识 |
|
||||||
| dataType | 数据类型 | 数据类型 |
|
| dataType | 数据类型 | 数据类型 |
|
||||||
| deviceType | 设备类型 | 设备类型 |
|
| deviceType | 设备类型 | 设备类型 |
|
||||||
|
|||||||
@ -140,7 +140,7 @@ const formOptions: VbenFormProps = {
|
|||||||
'EndCreationTime',
|
'EndCreationTime',
|
||||||
'IoTDataType',
|
'IoTDataType',
|
||||||
'StartCreationTime',
|
'StartCreationTime',
|
||||||
'SystemName',
|
'DataBaseName',
|
||||||
]);
|
]);
|
||||||
const hasRelevantChange = changedFields.some((field) =>
|
const hasRelevantChange = changedFields.some((field) =>
|
||||||
relevantFields.has(field),
|
relevantFields.has(field),
|
||||||
@ -184,7 +184,7 @@ const gridOptions: VxeGridProps<any> = {
|
|||||||
|
|
||||||
// 获取选中的设备信息
|
// 获取选中的设备信息
|
||||||
let deviceId = currentFormValues.DeviceId || '';
|
let deviceId = currentFormValues.DeviceId || '';
|
||||||
let systemName = '';
|
let dataBaseName = '';
|
||||||
const deviceType = currentFormValues.DeviceType || '';
|
const deviceType = currentFormValues.DeviceType || '';
|
||||||
|
|
||||||
// 优先使用选中的设备信息
|
// 优先使用选中的设备信息
|
||||||
@ -195,7 +195,7 @@ const gridOptions: VxeGridProps<any> = {
|
|||||||
: null);
|
: null);
|
||||||
|
|
||||||
if (deviceInfo) {
|
if (deviceInfo) {
|
||||||
systemName = deviceInfo.businessSystemName || '';
|
dataBaseName = deviceInfo.businessSystemName || '';
|
||||||
// 根据设备类型获取正确的 id
|
// 根据设备类型获取正确的 id
|
||||||
if (Number(deviceType) === 10) {
|
if (Number(deviceType) === 10) {
|
||||||
// 集中器类型使用 focusId
|
// 集中器类型使用 focusId
|
||||||
@ -213,7 +213,7 @@ const gridOptions: VxeGridProps<any> = {
|
|||||||
DeviceType: deviceType,
|
DeviceType: deviceType,
|
||||||
IoTDataType: currentFormValues.IoTDataType || '',
|
IoTDataType: currentFormValues.IoTDataType || '',
|
||||||
DeviceId: deviceId,
|
DeviceId: deviceId,
|
||||||
SystemName: systemName || currentFormValues.SystemName || '',
|
DataBaseName: dataBaseName || currentFormValues.DataBaseName || '',
|
||||||
StartCreationTime: formatDate(currentFormValues.StartCreationTime),
|
StartCreationTime: formatDate(currentFormValues.StartCreationTime),
|
||||||
EndCreationTime: formatDate(currentFormValues.EndCreationTime),
|
EndCreationTime: formatDate(currentFormValues.EndCreationTime),
|
||||||
FocusAddress: currentFormValues.FocusAddress || '',
|
FocusAddress: currentFormValues.FocusAddress || '',
|
||||||
|
|||||||
@ -4,19 +4,20 @@ import { computed } from 'vue';
|
|||||||
|
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
import { getSelectResultList } from '#/api-client';
|
import { getCommonGetSelectList } from '#/api-client';
|
||||||
import { $t } from '#/locales';
|
import { $t } from '#/locales';
|
||||||
|
|
||||||
export const querySchema = computed(() => [
|
export const querySchema = computed(() => [
|
||||||
{
|
{
|
||||||
component: 'ApiSelect',
|
component: 'ApiSelect',
|
||||||
fieldName: 'SystemName',
|
fieldName: 'DataBaseName',
|
||||||
label: $t('abp.IoTDBBase.SystemName'),
|
label: $t('abp.IoTDBBase.DataBaseName'),
|
||||||
componentProps: {
|
componentProps: {
|
||||||
api: getSelectResultList,
|
api: getCommonGetSelectList,
|
||||||
params: {
|
params: {
|
||||||
query: {
|
query: {
|
||||||
TypeName: 'BusinessSystemEnum',
|
typeName: 'BusinessSystemEnum'
|
||||||
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
labelField: 'secondValue',
|
labelField: 'secondValue',
|
||||||
@ -46,10 +47,10 @@ export const querySchema = computed(() => [
|
|||||||
fieldName: 'DeviceType',
|
fieldName: 'DeviceType',
|
||||||
label: $t('abp.IoTDBBase.DeviceType'),
|
label: $t('abp.IoTDBBase.DeviceType'),
|
||||||
componentProps: {
|
componentProps: {
|
||||||
api: getSelectResultList,
|
api: getCommonGetSelectList,
|
||||||
params: {
|
params: {
|
||||||
query: {
|
query: {
|
||||||
TypeName: 'MeterTypeEnum',
|
typeName: 'MeterTypeEnum'
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
labelField: 'value',
|
labelField: 'value',
|
||||||
@ -79,10 +80,12 @@ export const querySchema = computed(() => [
|
|||||||
fieldName: 'IoTDataType',
|
fieldName: 'IoTDataType',
|
||||||
label: $t('abp.IoTDBBase.IoTDataType'),
|
label: $t('abp.IoTDBBase.IoTDataType'),
|
||||||
componentProps: {
|
componentProps: {
|
||||||
api: getSelectResultList,
|
api: getCommonGetSelectList,
|
||||||
params: {
|
params: {
|
||||||
query: {
|
query: {
|
||||||
TypeName: 'IoTDBDataTypeConst',
|
input: {
|
||||||
|
typeName: 'IoTDBDataTypeConst',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
labelField: 'value',
|
labelField: 'value',
|
||||||
|
|||||||
@ -63,7 +63,7 @@ if (data?.items && data.items.length > 0) {
|
|||||||
```typescript
|
```typescript
|
||||||
// 在 dynamicColumns.ts 中添加字段映射
|
// 在 dynamicColumns.ts 中添加字段映射
|
||||||
export const fieldNameMapping: FieldMapping = {
|
export const fieldNameMapping: FieldMapping = {
|
||||||
SystemName: '系统名称',
|
DataBaseName: '数据库名称',
|
||||||
ProjectId: '项目ID',
|
ProjectId: '项目ID',
|
||||||
// 添加新的字段映射
|
// 添加新的字段映射
|
||||||
CustomField: '自定义字段',
|
CustomField: '自定义字段',
|
||||||
@ -96,7 +96,7 @@ export const fieldTypeConfig: FieldTypeConfig = {
|
|||||||
|
|
||||||
| 字段名 | 显示名称 | 说明 |
|
| 字段名 | 显示名称 | 说明 |
|
||||||
|--------|----------|------|
|
|--------|----------|------|
|
||||||
| SystemName | 系统名称 | 系统名称字段 |
|
| DataBaseName | 数据库名称 | 数据库名称字段 |
|
||||||
| ProjectId | 项目ID | 项目标识符 |
|
| ProjectId | 项目ID | 项目标识符 |
|
||||||
| ProjectName | 项目名称 | 项目名称 |
|
| ProjectName | 项目名称 | 项目名称 |
|
||||||
| IoTDataType | IoT数据类型 | 数据类型标识 |
|
| IoTDataType | IoT数据类型 | 数据类型标识 |
|
||||||
@ -124,7 +124,7 @@ export const fieldTypeConfig: FieldTypeConfig = {
|
|||||||
// 固定列定义
|
// 固定列定义
|
||||||
const fixedColumns = computed(() => [
|
const fixedColumns = computed(() => [
|
||||||
{ title: '序号', type: 'seq', width: 50 },
|
{ title: '序号', type: 'seq', width: 50 },
|
||||||
{ field: 'SystemName', title: '系统名称', width: 150 },
|
{ field: 'DataBaseName', title: '数据库名称', width: 150 },
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// 动态列
|
// 动态列
|
||||||
@ -142,9 +142,9 @@ const allColumns = computed(() => [
|
|||||||
```typescript
|
```typescript
|
||||||
import { sortFieldsByImportance } from './example';
|
import { sortFieldsByImportance } from './example';
|
||||||
|
|
||||||
const fields = ['CustomField', 'Timestamps', 'SystemName'];
|
const fields = ['CustomField', 'Timestamps', 'DataBaseName'];
|
||||||
const sortedFields = sortFieldsByImportance(fields);
|
const sortedFields = sortFieldsByImportance(fields);
|
||||||
// 结果: ['Timestamps', 'SystemName', 'CustomField']
|
// 结果: ['Timestamps', 'DataBaseName', 'CustomField']
|
||||||
```
|
```
|
||||||
|
|
||||||
### 3. 数据验证
|
### 3. 数据验证
|
||||||
|
|||||||
@ -7,12 +7,12 @@ import type {
|
|||||||
|
|
||||||
// 字段名映射配置
|
// 字段名映射配置
|
||||||
export const fieldNameMapping: FieldMapping = {
|
export const fieldNameMapping: FieldMapping = {
|
||||||
// SystemName: '系统名称',
|
// DataBaseName: '数据库名称',
|
||||||
// ProjectId: '项目ID',
|
// ProjectId: '项目ID',
|
||||||
// ProjectName: '项目名称',
|
// ProjectName: '项目名称',
|
||||||
IoTDataType: 'IoT数据类型',
|
IoTDataType: 'IoT数据类型',
|
||||||
DeviceType: '设备类型',
|
DeviceType: '设备类型',
|
||||||
DeviceId: '设备ID',
|
DeviceAddress: '设备ID',
|
||||||
Timestamps: '时间戳',
|
Timestamps: '时间戳',
|
||||||
// 可以根据需要添加更多映射
|
// 可以根据需要添加更多映射
|
||||||
};
|
};
|
||||||
@ -34,10 +34,10 @@ export const fieldTypeConfig: FieldTypeConfig = {
|
|||||||
|
|
||||||
// 固定字段列表 - 这些字段已经在固定列中定义,不需要在动态列中重复生成
|
// 固定字段列表 - 这些字段已经在固定列中定义,不需要在动态列中重复生成
|
||||||
const FIXED_FIELDS = [
|
const FIXED_FIELDS = [
|
||||||
// 'SystemName',
|
// 'DataBaseName',
|
||||||
'DeviceType',
|
'DeviceType',
|
||||||
'IoTDataType',
|
'IoTDataType',
|
||||||
'DeviceId',
|
'DeviceAddress',
|
||||||
'Timestamps',
|
'Timestamps',
|
||||||
'FormattedTimestamps',
|
'FormattedTimestamps',
|
||||||
'DeviceAddress',
|
'DeviceAddress',
|
||||||
|
|||||||
@ -68,7 +68,7 @@ const formatDate = (date: Date | string) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const { DeviceType, DeviceId, FocusAddress, SystemName } = route.query;
|
const { DeviceType, DeviceId, FocusAddress, DataBaseName } = route.query;
|
||||||
|
|
||||||
// 动态列定义
|
// 动态列定义
|
||||||
const dynamicColumns = ref<any[]>([]);
|
const dynamicColumns = ref<any[]>([]);
|
||||||
@ -91,8 +91,8 @@ const fixedColumns = [
|
|||||||
slots: {},
|
slots: {},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
field: 'SystemName',
|
field: 'DataBaseName',
|
||||||
title: $t('abp.IoTDBBase.SystemName'),
|
title: $t('abp.IoTDBBase.DataBaseName'),
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
showOverflow: true,
|
showOverflow: true,
|
||||||
slots: {},
|
slots: {},
|
||||||
@ -111,13 +111,6 @@ const fixedColumns = [
|
|||||||
showOverflow: true,
|
showOverflow: true,
|
||||||
slots: {},
|
slots: {},
|
||||||
},
|
},
|
||||||
{
|
|
||||||
field: 'DeviceId',
|
|
||||||
title: $t('abp.IoTDBBase.DeviceId'),
|
|
||||||
minWidth: 150,
|
|
||||||
showOverflow: true,
|
|
||||||
slots: {},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
field: 'DeviceAddress',
|
field: 'DeviceAddress',
|
||||||
title: $t('abp.IoTDBBase.DeviceAddress'),
|
title: $t('abp.IoTDBBase.DeviceAddress'),
|
||||||
@ -170,7 +163,7 @@ const formOptions: VbenFormProps = {
|
|||||||
FocusAddress: FocusAddress as string,
|
FocusAddress: FocusAddress as string,
|
||||||
DeviceType: DeviceType ? Number(DeviceType) : undefined,
|
DeviceType: DeviceType ? Number(DeviceType) : undefined,
|
||||||
DeviceId: DeviceId as string,
|
DeviceId: DeviceId as string,
|
||||||
SystemName: SystemName as string,
|
DataBaseName: DataBaseName as string,
|
||||||
},
|
},
|
||||||
// 禁用表单值变化时自动提交,使用自定义处理函数
|
// 禁用表单值变化时自动提交,使用自定义处理函数
|
||||||
submitOnChange: false,
|
submitOnChange: false,
|
||||||
@ -184,7 +177,7 @@ const formOptions: VbenFormProps = {
|
|||||||
'FocusAddress',
|
'FocusAddress',
|
||||||
'IoTDataType',
|
'IoTDataType',
|
||||||
'StartCreationTime',
|
'StartCreationTime',
|
||||||
'SystemName',
|
'DataBaseName',
|
||||||
]);
|
]);
|
||||||
const hasRelevantChange = changedFields.some((field) =>
|
const hasRelevantChange = changedFields.some((field) =>
|
||||||
relevantFields.has(field),
|
relevantFields.has(field),
|
||||||
@ -336,7 +329,7 @@ const gridOptions: VxeGridProps<any> = {
|
|||||||
DeviceId: finalDeviceId ? finalDeviceId.toString() : '',
|
DeviceId: finalDeviceId ? finalDeviceId.toString() : '',
|
||||||
FocusAddress: finalFocusAddress || FocusAddress || '',
|
FocusAddress: finalFocusAddress || FocusAddress || '',
|
||||||
// 添加其他表单参数
|
// 添加其他表单参数
|
||||||
SystemName: currentFormValues.SystemName || SystemName,
|
DataBaseName: currentFormValues.DataBaseName || DataBaseName,
|
||||||
IoTDataType: ioTDataTypeValue || undefined,
|
IoTDataType: ioTDataTypeValue || undefined,
|
||||||
// 添加日期范围参数
|
// 添加日期范围参数
|
||||||
StartCreationTime: startCreationTime || undefined,
|
StartCreationTime: startCreationTime || undefined,
|
||||||
@ -443,7 +436,7 @@ const initializeGrid = async () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 如果有路由参数,自动触发查询
|
// 如果有路由参数,自动触发查询
|
||||||
if (DeviceType || DeviceId || FocusAddress || SystemName) {
|
if (DeviceType || DeviceId || FocusAddress || DataBaseName) {
|
||||||
// 延迟一下确保表格已完全初始化
|
// 延迟一下确保表格已完全初始化
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (gridApi) {
|
if (gridApi) {
|
||||||
@ -458,7 +451,7 @@ const initializeGrid = async () => {
|
|||||||
|
|
||||||
// 监听路由参数变化,当有路由参数时自动触发查询
|
// 监听路由参数变化,当有路由参数时自动触发查询
|
||||||
watch(
|
watch(
|
||||||
() => [DeviceType, DeviceId, FocusAddress, SystemName],
|
() => [DeviceType, DeviceId, FocusAddress, DataBaseName],
|
||||||
async (newValues, oldValues) => {
|
async (newValues, oldValues) => {
|
||||||
// 如果有路由参数,等待设备信息加载完成后自动触发查询
|
// 如果有路由参数,等待设备信息加载完成后自动触发查询
|
||||||
if (newValues.some(Boolean) && gridApi && isGridInitialized.value) {
|
if (newValues.some(Boolean) && gridApi && isGridInitialized.value) {
|
||||||
|
|||||||
@ -2,19 +2,19 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
|
|||||||
|
|
||||||
import { computed } from 'vue';
|
import { computed } from 'vue';
|
||||||
|
|
||||||
import { getSelectResultList } from '#/api-client';
|
import { getCommonGetSelectList } from '#/api-client';
|
||||||
import { $t } from '#/locales';
|
import { $t } from '#/locales';
|
||||||
|
|
||||||
export const querySchema = computed(() => [
|
export const querySchema = computed(() => [
|
||||||
{
|
{
|
||||||
component: 'ApiSelect',
|
component: 'ApiSelect',
|
||||||
fieldName: 'SystemName',
|
fieldName: 'DataBaseName',
|
||||||
label: $t('abp.IoTDBBase.SystemName'),
|
label: $t('abp.IoTDBBase.DataBaseName'),
|
||||||
componentProps: {
|
componentProps: {
|
||||||
api: getSelectResultList,
|
api: getCommonGetSelectList,
|
||||||
params: {
|
params: {
|
||||||
query: {
|
query: {
|
||||||
TypeName: 'BusinessSystemEnum',
|
typeName: 'BusinessSystemEnum',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
labelField: 'secondValue',
|
labelField: 'secondValue',
|
||||||
@ -44,10 +44,10 @@ export const querySchema = computed(() => [
|
|||||||
fieldName: 'DeviceType',
|
fieldName: 'DeviceType',
|
||||||
label: $t('abp.IoTDBBase.DeviceType'),
|
label: $t('abp.IoTDBBase.DeviceType'),
|
||||||
componentProps: {
|
componentProps: {
|
||||||
api: getSelectResultList,
|
api: getCommonGetSelectList,
|
||||||
params: {
|
params: {
|
||||||
query: {
|
query: {
|
||||||
TypeName: 'MeterTypeEnum',
|
typeName: 'MeterTypeEnum'
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
labelField: 'value',
|
labelField: 'value',
|
||||||
@ -77,10 +77,10 @@ export const querySchema = computed(() => [
|
|||||||
fieldName: 'IoTDataType',
|
fieldName: 'IoTDataType',
|
||||||
label: $t('abp.IoTDBBase.IoTDataType'),
|
label: $t('abp.IoTDBBase.IoTDataType'),
|
||||||
componentProps: {
|
componentProps: {
|
||||||
api: getSelectResultList,
|
api: getCommonGetSelectList,
|
||||||
params: {
|
params: {
|
||||||
query: {
|
query: {
|
||||||
TypeName: 'IoTDBDataTypeConst',
|
typeName: 'IoTDBDataTypeConst'
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
labelField: 'value',
|
labelField: 'value',
|
||||||
@ -147,13 +147,8 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
|
|||||||
minWidth: '150',
|
minWidth: '150',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
field: 'SystemName',
|
field: 'DataBaseName',
|
||||||
title: $t('abp.IoTDBBase.SystemName'),
|
title: $t('abp.IoTDBBase.DataBaseName'),
|
||||||
minWidth: '150',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
field: 'ProjectId',
|
|
||||||
title: $t('abp.IoTDBBase.ProjectId'),
|
|
||||||
minWidth: '150',
|
minWidth: '150',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -167,8 +162,8 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
|
|||||||
minWidth: '150',
|
minWidth: '150',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
field: 'DeviceId',
|
field: 'DeviceAddress',
|
||||||
title: $t('abp.IoTDBBase.DeviceId'),
|
title: $t('abp.IoTDBBase.DeviceAddress'),
|
||||||
minWidth: '150',
|
minWidth: '150',
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
// 基础设备数据类型
|
// 基础设备数据类型
|
||||||
export interface BaseDeviceData {
|
export interface BaseDeviceData {
|
||||||
SystemName?: string;
|
DataBaseName?: string;
|
||||||
ProjectId?: string;
|
ProjectId?: string;
|
||||||
ProjectName?: string;
|
ProjectName?: string;
|
||||||
IoTDataType?: string;
|
IoTDataType?: string;
|
||||||
|
|||||||
@ -139,7 +139,7 @@ const formOptions: VbenFormProps = {
|
|||||||
'EndCreationTime',
|
'EndCreationTime',
|
||||||
'IoTDataType',
|
'IoTDataType',
|
||||||
'StartCreationTime',
|
'StartCreationTime',
|
||||||
'SystemName',
|
'DataBaseName',
|
||||||
]);
|
]);
|
||||||
const hasRelevantChange = changedFields.some((field) =>
|
const hasRelevantChange = changedFields.some((field) =>
|
||||||
relevantFields.has(field),
|
relevantFields.has(field),
|
||||||
@ -182,7 +182,7 @@ const gridOptions: VxeGridProps<any> = {
|
|||||||
|
|
||||||
// 获取选中的设备信息
|
// 获取选中的设备信息
|
||||||
let deviceId = currentFormValues.DeviceId || '';
|
let deviceId = currentFormValues.DeviceId || '';
|
||||||
let systemName = '';
|
let dataBaseName = '';
|
||||||
const deviceType = currentFormValues.DeviceType || '';
|
const deviceType = currentFormValues.DeviceType || '';
|
||||||
|
|
||||||
// 优先使用选中的设备信息
|
// 优先使用选中的设备信息
|
||||||
@ -193,7 +193,7 @@ const gridOptions: VxeGridProps<any> = {
|
|||||||
: null);
|
: null);
|
||||||
|
|
||||||
if (deviceInfo) {
|
if (deviceInfo) {
|
||||||
systemName = deviceInfo.businessSystemName || '';
|
dataBaseName = deviceInfo.businessSystemName || '';
|
||||||
// 根据设备类型获取正确的 id
|
// 根据设备类型获取正确的 id
|
||||||
if (Number(deviceType) === 10) {
|
if (Number(deviceType) === 10) {
|
||||||
// 集中器类型使用 focusId
|
// 集中器类型使用 focusId
|
||||||
@ -212,7 +212,7 @@ const gridOptions: VxeGridProps<any> = {
|
|||||||
DeviceType: deviceType,
|
DeviceType: deviceType,
|
||||||
IoTDataType: currentFormValues.IoTDataType || '',
|
IoTDataType: currentFormValues.IoTDataType || '',
|
||||||
DeviceId: deviceId,
|
DeviceId: deviceId,
|
||||||
SystemName: systemName || currentFormValues.SystemName || '',
|
DataBaseName: dataBaseName || currentFormValues.DataBaseName || '',
|
||||||
StartCreationTime: formatDate(currentFormValues.StartCreationTime),
|
StartCreationTime: formatDate(currentFormValues.StartCreationTime),
|
||||||
EndCreationTime: formatDate(currentFormValues.EndCreationTime),
|
EndCreationTime: formatDate(currentFormValues.EndCreationTime),
|
||||||
};
|
};
|
||||||
|
|||||||
@ -4,19 +4,19 @@ import { computed } from 'vue';
|
|||||||
|
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
import { getSelectResultList } from '#/api-client';
|
import { getCommonGetSelectList } from '#/api-client';
|
||||||
import { $t } from '#/locales';
|
import { $t } from '#/locales';
|
||||||
|
|
||||||
export const querySchema = computed(() => [
|
export const querySchema = computed(() => [
|
||||||
{
|
{
|
||||||
component: 'ApiSelect',
|
component: 'ApiSelect',
|
||||||
fieldName: 'SystemName',
|
fieldName: 'DataBaseName',
|
||||||
label: $t('abp.IoTDBBase.SystemName'),
|
label: $t('abp.IoTDBBase.DataBaseName'),
|
||||||
componentProps: {
|
componentProps: {
|
||||||
api: getSelectResultList,
|
api: getCommonGetSelectList,
|
||||||
params: {
|
params: {
|
||||||
query: {
|
query: {
|
||||||
TypeName: 'BusinessSystemEnum',
|
typeName: 'BusinessSystemEnum',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
labelField: 'secondValue',
|
labelField: 'secondValue',
|
||||||
@ -46,10 +46,10 @@ export const querySchema = computed(() => [
|
|||||||
fieldName: 'DeviceType',
|
fieldName: 'DeviceType',
|
||||||
label: $t('abp.IoTDBBase.DeviceType'),
|
label: $t('abp.IoTDBBase.DeviceType'),
|
||||||
componentProps: {
|
componentProps: {
|
||||||
api: getSelectResultList,
|
api: getCommonGetSelectList,
|
||||||
params: {
|
params: {
|
||||||
query: {
|
query: {
|
||||||
TypeName: 'MeterTypeEnum',
|
typeName: 'MeterTypeEnum',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
labelField: 'value',
|
labelField: 'value',
|
||||||
@ -79,10 +79,10 @@ export const querySchema = computed(() => [
|
|||||||
fieldName: 'IoTDataType',
|
fieldName: 'IoTDataType',
|
||||||
label: $t('abp.IoTDBBase.IoTDataType'),
|
label: $t('abp.IoTDBBase.IoTDataType'),
|
||||||
componentProps: {
|
componentProps: {
|
||||||
api: getSelectResultList,
|
api: getCommonGetSelectList,
|
||||||
params: {
|
params: {
|
||||||
query: {
|
query: {
|
||||||
TypeName: 'IoTDBDataTypeConst',
|
typeName: 'IoTDBDataTypeConst',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
labelField: 'value',
|
labelField: 'value',
|
||||||
|
|||||||
@ -19,7 +19,7 @@ export const querySchema = computed(() => [
|
|||||||
|
|
||||||
export const tableSchema: any = computed((): VxeGridProps['columns'] => [
|
export const tableSchema: any = computed((): VxeGridProps['columns'] => [
|
||||||
{ title: $t('common.seq'), type: 'seq', width: 50 },
|
{ title: $t('common.seq'), type: 'seq', width: 50 },
|
||||||
{ field: 'systemName', title: $t('abp.log.systemName'), minWidth: '150' },
|
{ field: 'dataBaseName', title: $t('abp.log.dataBaseName'), minWidth: '150' },
|
||||||
{
|
{
|
||||||
field: 'projectId',
|
field: 'projectId',
|
||||||
title: $t('abp.log.projectId'),
|
title: $t('abp.log.projectId'),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user