admin/JiShe.IOT.UI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: admin:6c1fdb7adb9e61b58b2ab0ecd20f017cfc52ba1f
Branches Tags
admin:master
admin:xiehao-bug
admin:zhy_feat_dev
..
compare: admin:a7c4a19eb5f8b13cecf1319148b9c6a47bfc0df7
Branches Tags
admin:master
admin:xiehao-bug
admin:zhy_feat_dev

No commits in common. "6c1fdb7adb9e61b58b2ab0ecd20f017cfc52ba1f" and "a7c4a19eb5f8b13cecf1319148b9c6a47bfc0df7" have entirely different histories.
6c1fdb7adb ... a7c4a19eb5

12 changed files with 301 additions and 57 deletions
Show Stats Expand all files Collapse all files

4
apps/web-antd/src/locales/langs/zh-CN/abp.json
View File

@ -218,8 +218,8 @@
"IoTDataType": "数据类型",
"DataBaseName": "所属数据库",
"DeviceType": "设备类型",
"Timestamps": "UTC时标(纳秒)",
"FormattedTimestamps": "本地时间",
"Timestamps": "时标(纳秒)",
"FormattedTimestamps": "时标",
"DevicePath": "设备路径",
"DeviceAddress": "设备地址"
},

5
apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue
View File

@ -186,11 +186,6 @@ async function onEdit(record: any) {
// 根据平台类型设置表单值
const formValues = { ...record };
// 确保ioTPlatform是字符串格式，因为ApiSelect组件的valueField是'key'
if (formValues.ioTPlatform !== undefined && formValues.ioTPlatform !== null) {
formValues.ioTPlatform = String(formValues.ioTPlatform);
}
if (record.ioTPlatform === 2 || record.ioTPlatform === '2') {
// OneNET平台
formValues.oneNETAccountId = record.ioTPlatformAccountId;

2
apps/web-antd/src/views/devicemanagement/deviceinfo/schema.ts
View File

@ -104,8 +104,6 @@ export const addDeviceFormSchema: any = computed(() => [
valueField: 'key',
optionsPropName: 'options',
immediate: true,
allowClear: true,
placeholder: $t('common.pleaseSelect') + $t('abp.deviceInfos.ioTPlatform'),
afterFetch: (res: any) => {
// 确保返回的是数组格式
if (Array.isArray(res)) {

21
apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/index.vue
View File

@ -136,9 +136,11 @@ const formOptions: VbenFormProps = {
// 当任何相关字段发生变化时，刷新表格数据
const relevantFields = new Set([
'DeviceId',
'DeviceType',
'EndCreationTime',
'IoTDataType',
'StartCreationTime',
'DataBaseName',
]);
const hasRelevantChange = changedFields.some((field) =>
relevantFields.has(field),
@ -181,7 +183,9 @@ const gridOptions: VxeGridProps<any> = {
const currentFormValues = gridApi?.formApi ? await gridApi.formApi.getValues() : {};
// 获取选中的设备信息
let deviceAddress = currentFormValues.DeviceId || '';
let deviceId = currentFormValues.DeviceId || '';
let dataBaseName = '';
const deviceType = currentFormValues.DeviceType || '';
// 优先使用选中的设备信息
const deviceInfo =
@ -191,17 +195,28 @@ const gridOptions: VxeGridProps<any> = {
: null);
if (deviceInfo) {
deviceAddress = deviceInfo.deviceAddress || deviceAddress;
dataBaseName = deviceInfo.businessSystemName || '';
// 根据设备类型获取正确的 id
if (Number(deviceType) === 10) {
// 集中器类型使用 focusId
deviceId = deviceInfo.focusId || deviceId;
} else {
// 其他设备类型使用 meterId
deviceId = deviceInfo.meterId || deviceId;
}
}
// 构建查询参数
const queryParams = {
pageIndex: page.currentPage,
pageSize: page.pageSize,
SearchKeyword: currentFormValues.SearchKeyword || '',
DeviceType: deviceType,
IoTDataType: currentFormValues.IoTDataType || '',
DeviceId: deviceAddress, // 直接使用设备地址
DeviceId: deviceId,
DataBaseName: dataBaseName || currentFormValues.DataBaseName || '',
StartCreationTime: formatDate(currentFormValues.StartCreationTime),
EndCreationTime: formatDate(currentFormValues.EndCreationTime),
FocusAddress: currentFormValues.FocusAddress || '',
};
if (DeviceType) queryParams.DeviceType = DeviceType;

84
apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/schema.ts
View File

@ -10,21 +10,88 @@ import { $t } from '#/locales';
export const querySchema = computed(() => [
{
component: 'ApiSelect',
fieldName: 'IoTDataType',
label: $t('abp.IoTDBBase.IoTDataType'),
fieldName: 'DataBaseName',
label: $t('abp.IoTDBBase.DataBaseName'),
componentProps: {
api: getCommonGetSelectList,
params: {
query: {
typeName: 'IoTDBDataTypeConst',
typeName: 'BusinessSystemEnum'
},
},
labelField: 'secondValue',
valueField: 'value',
optionsPropName: 'options',
immediate: true,
afterFetch: (res: any) => {
// 确保返回的是数组格式
if (Array.isArray(res)) {
return res;
}
// 如果是包装在 items 中的，提取出来
if (res && Array.isArray(res.items)) {
return res.items;
}
// 如果是包装在 data 中的，提取出来
if (res && Array.isArray(res.data)) {
return res.data;
}
// 如果都不是，返回空数组
return [];
},
},
},
{
component: 'ApiSelect',
fieldName: 'DeviceType',
label: $t('abp.IoTDBBase.DeviceType'),
componentProps: {
api: getCommonGetSelectList,
params: {
query: {
typeName: 'MeterTypeEnum'
},
},
labelField: 'value',
valueField: 'key',
optionsPropName: 'options',
immediate: true,
afterFetch: (res: any) => {
// 确保返回的是数组格式
if (Array.isArray(res)) {
return res;
}
// 如果是包装在 items 中的，提取出来
if (res && Array.isArray(res.items)) {
return res.items;
}
// 如果是包装在 data 中的，提取出来
if (res && Array.isArray(res.data)) {
return res.data;
}
// 如果都不是，返回空数组
return [];
},
},
},
{
component: 'ApiSelect',
fieldName: 'IoTDataType',
label: $t('abp.IoTDBBase.IoTDataType'),
componentProps: {
api: getCommonGetSelectList,
params: {
query: {
input: {
typeName: 'IoTDBDataTypeConst',
},
},
},
labelField: 'value',
valueField: 'key',
optionsPropName: 'options',
immediate: true,
allowClear: true,
placeholder: $t('common.pleaseSelect') + $t('abp.IoTDBBase.IoTDataType'),
afterFetch: (res: any) => {
// 确保返回的是数组格式
if (Array.isArray(res)) {
@ -94,7 +161,12 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
return cellValue ? dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss') : '';
},
},
{
field: 'deviceType',
title: $t('abp.IoTDBBase.DeviceType'),
minWidth: 150,
slots: {},
},
{
field: 'ioTDataType',
title: $t('abp.IoTDBBase.IoTDataType'),

4
apps/web-antd/src/views/iotdbdatamanagement/deviceData/DeviceSelect.vue
View File

@ -59,8 +59,8 @@ const fetchData = async () => {
if (data?.items) {
options.value = data.items.map((item) => ({
label: `${item.deviceName || item.deviceAddress} (${item.deviceAddress})`,
value: item.deviceAddress, // 使用设备地址作为值
label: item.meterName,
value: item.id,
...item, // 保留完整数据
}));
total.value = data.totalCount || 0;

75
apps/web-antd/src/views/iotdbdatamanagement/deviceData/index.vue
View File

@ -42,12 +42,12 @@ const fetchDeviceOptions = async () => {
}
};
// 根据设备地址获取设备信息对象
const getDeviceInfoByAddress = (deviceAddress: string) => {
if (!deviceAddress || !deviceOptions.value || deviceOptions.value.length === 0) {
// 根据设备ID获取设备信息对象
const getDeviceInfoById = (deviceId: string) => {
if (!deviceId || !deviceOptions.value || deviceOptions.value.length === 0) {
return null;
}
return deviceOptions.value.find((device) => device.deviceAddress === deviceAddress);
return deviceOptions.value.find((device) => device.id === deviceId);
};
// 格式化日期为 yyyy-MM-dd HH:mm:ss 格式
@ -68,7 +68,7 @@ const formatDate = (date: Date | string) => {
};
const route = useRoute();
const { DeviceType, DeviceId } = route.query;
const { DeviceType, DeviceId, FocusAddress, DataBaseName } = route.query;
// 动态列定义
const dynamicColumns = ref<any[]>([]);
@ -90,6 +90,13 @@ const fixedColumns = [
showOverflow: true,
slots: {},
},
{
field: 'DataBaseName',
title: $t('abp.IoTDBBase.DataBaseName'),
minWidth: 150,
showOverflow: true,
slots: {},
},
{
field: 'DeviceType',
title: $t('abp.IoTDBBase.DeviceType'),
@ -153,8 +160,10 @@ initDefaultColumns();
const formOptions: VbenFormProps = {
schema: querySchema.value,
initialValues: {
FocusAddress: FocusAddress as string,
DeviceType: DeviceType ? Number(DeviceType) : undefined,
DeviceAddress: DeviceId as string, // 使用DeviceId作为DeviceAddress的初始值
DeviceId: DeviceId as string,
DataBaseName: DataBaseName as string,
},
// 禁用表单值变化时自动提交，使用自定义处理函数
submitOnChange: false,
@ -162,25 +171,27 @@ const formOptions: VbenFormProps = {
handleValuesChange: async (values, changedFields) => {
// 当任何相关字段发生变化时，刷新表格数据
const relevantFields = new Set([
'DeviceAddress',
'DeviceId',
'DeviceType',
'EndCreationTime',
'FocusAddress',
'IoTDataType',
'StartCreationTime',
'DataBaseName',
]);
const hasRelevantChange = changedFields.some((field) =>
relevantFields.has(field),
);
// 新增：DeviceAddress变化时同步selectedDeviceInfo
if (changedFields.includes('DeviceAddress')) {
const deviceAddress = values.DeviceAddress;
// 新增：DeviceId变化时同步selectedDeviceInfo
if (changedFields.includes('DeviceId')) {
const deviceId = values.DeviceId;
if (deviceAddress) {
if (deviceId) {
// 先尝试从 deviceOptions 中查找（备用方案）
let device =
deviceOptions.value.length > 0
? deviceOptions.value.find((d) => d.deviceAddress === deviceAddress)
? deviceOptions.value.find((d) => d.id === deviceId)
: null;
// 如果没找到，尝试从 DeviceSelect 组件中获取
@ -188,7 +199,7 @@ const formOptions: VbenFormProps = {
try {
// 获取 DeviceSelect 组件的实例
const deviceSelectRef =
gridApi.formApi.getFieldComponentRef('DeviceAddress');
gridApi.formApi.getFieldComponentRef('DeviceId');
if (deviceSelectRef && deviceSelectRef.getSelectedDevice) {
device = deviceSelectRef.getSelectedDevice();
}
@ -204,7 +215,7 @@ const formOptions: VbenFormProps = {
setTimeout(() => {
try {
const deviceSelectRef =
gridApi.formApi.getFieldComponentRef('DeviceAddress');
gridApi.formApi.getFieldComponentRef('DeviceId');
if (deviceSelectRef && deviceSelectRef.getSelectedDevice) {
const delayedDevice = deviceSelectRef.getSelectedDevice();
if (delayedDevice) {
@ -267,7 +278,7 @@ const gridOptions: VxeGridProps<any> = {
(gridApi?.formApi ? await gridApi.formApi.getValues() : {}) ||
{};
// 处理DeviceType和IoTDataType，确保传递数字类型
const deviceTypeValue = currentFormValues.DeviceType;
const deviceTypeValue = currentFormValues.DeviceType || DeviceType;
const deviceTypeNumber = deviceTypeValue
? Number(deviceTypeValue)
: undefined;
@ -282,27 +293,43 @@ const gridOptions: VxeGridProps<any> = {
? formatDate(currentFormValues.EndCreationTime)
: undefined;
// 获取选中的设备信息
let deviceAddress = currentFormValues.DeviceAddress || '';
// 处理DeviceId，当设备类型为集中器(10)时，使用focusId
let finalDeviceId = currentFormValues.DeviceId || DeviceId || '';
let finalFocusAddress = currentFormValues.FocusAddress || '';
// 优先使用选中的设备信息
const deviceInfo =
selectedDeviceInfo.value ||
(currentFormValues.DeviceAddress && deviceOptions.value.length > 0
? getDeviceInfoByAddress(currentFormValues.DeviceAddress)
(currentFormValues.DeviceId && deviceOptions.value.length > 0
? getDeviceInfoById(currentFormValues.DeviceId)
: null);
if (deviceInfo) {
deviceAddress = deviceInfo.deviceAddress || deviceAddress;
finalFocusAddress = deviceInfo.focusAddress || '';
if (deviceTypeNumber === 10) {
// 集中器类型使用focusId
if (deviceInfo.focusId) {
finalDeviceId = deviceInfo.focusId;
}
} else {
// 其他设备类型使用meterId
if (deviceInfo.meterId) {
finalDeviceId = deviceInfo.meterId;
}
}
}
try {
const { data } = await postTreeModelDeviceDataInfoPage({
body: {
pageIndex: page.currentPage,
pageSize: page.pageSize,
// 使用设备地址作为DeviceAddress
DeviceAddress: deviceAddress,
// 优先使用表单中的值，如果没有则使用路由参数
DeviceType: deviceTypeNumber || undefined,
DeviceId: finalDeviceId ? finalDeviceId.toString() : '',
FocusAddress: finalFocusAddress || FocusAddress || '',
// 添加其他表单参数
DataBaseName: currentFormValues.DataBaseName || DataBaseName,
IoTDataType: ioTDataTypeValue || undefined,
// 添加日期范围参数
StartCreationTime: startCreationTime || undefined,
@ -409,7 +436,7 @@ const initializeGrid = async () => {
}
// 如果有路由参数，自动触发查询
if (DeviceType || DeviceId) {
if (DeviceType || DeviceId || FocusAddress || DataBaseName) {
// 延迟一下确保表格已完全初始化
setTimeout(() => {
if (gridApi) {
@ -424,7 +451,7 @@ const initializeGrid = async () => {
// 监听路由参数变化，当有路由参数时自动触发查询
watch(
() => [DeviceType, DeviceId],
() => [DeviceType, DeviceId, FocusAddress, DataBaseName],
async (newValues, oldValues) => {
// 如果有路由参数，等待设备信息加载完成后自动触发查询
if (newValues.some(Boolean) && gridApi && isGridInitialized.value) {

46
apps/web-antd/src/views/iotdbdatamanagement/deviceData/schema.ts
View File

@ -6,6 +6,39 @@ import { getCommonGetSelectList } from '#/api-client';
import { $t } from '#/locales';
export const querySchema = computed(() => [
{
component: 'ApiSelect',
fieldName: 'DataBaseName',
label: $t('abp.IoTDBBase.DataBaseName'),
componentProps: {
api: getCommonGetSelectList,
params: {
query: {
typeName: 'BusinessSystemEnum',
},
},
labelField: 'secondValue',
valueField: 'value',
optionsPropName: 'options',
immediate: true,
afterFetch: (res: any) => {
// 确保返回的是数组格式
if (Array.isArray(res)) {
return res;
}
// 如果是包装在 items 中的，提取出来
if (res && Array.isArray(res.items)) {
return res.items;
}
// 如果是包装在 data 中的，提取出来
if (res && Array.isArray(res.data)) {
return res.data;
}
// 如果都不是，返回空数组
return [];
},
},
},
{
component: 'ApiSelect',
fieldName: 'DeviceType',
@ -14,15 +47,13 @@ export const querySchema = computed(() => [
api: getCommonGetSelectList,
params: {
query: {
typeName: 'DeviceTypeEnum',
typeName: 'MeterTypeEnum',
},
},
labelField: 'value',
valueField: 'key',
optionsPropName: 'options',
immediate: true,
allowClear: true,
placeholder: $t('common.pleaseSelect') + $t('abp.IoTDBBase.DeviceType'),
afterFetch: (res: any) => {
// 确保返回的是数组格式
if (Array.isArray(res)) {
@ -56,8 +87,6 @@ export const querySchema = computed(() => [
valueField: 'key',
optionsPropName: 'options',
immediate: true,
allowClear: true,
placeholder: $t('common.pleaseSelect') + $t('abp.IoTDBBase.IoTDataType'),
afterFetch: (res: any) => {
// 确保返回的是数组格式
if (Array.isArray(res)) {
@ -78,7 +107,7 @@ export const querySchema = computed(() => [
},
{
component: 'DeviceSelect',
fieldName: 'DeviceAddress',
fieldName: 'DeviceId',
label: $t('abp.log.deviceInfo'),
componentProps: {
placeholder: $t('common.pleaseSelect') + $t('abp.log.deviceInfo'),
@ -117,6 +146,11 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
title: $t('abp.IoTDBBase.Timestamps'),
minWidth: '150',
},
{
field: 'DataBaseName',
title: $t('abp.IoTDBBase.DataBaseName'),
minWidth: '150',
},
{
field: 'DeviceType',
title: $t('abp.IoTDBBase.DeviceType'),

20
apps/web-antd/src/views/iotdbdatamanagement/onenetLog/index.vue
View File

@ -135,9 +135,11 @@ const formOptions: VbenFormProps = {
// 当任何相关字段发生变化时，刷新表格数据
const relevantFields = new Set([
'DeviceId',
'DeviceType',
'EndCreationTime',
'IoTDataType',
'StartCreationTime',
'DataBaseName',
]);
const hasRelevantChange = changedFields.some((field) =>
relevantFields.has(field),
@ -179,7 +181,9 @@ const gridOptions: VxeGridProps<any> = {
const currentFormValues = gridApi?.formApi ? await gridApi.formApi.getValues() : {};
// 获取选中的设备信息
let deviceAddress = currentFormValues.DeviceId || '';
let deviceId = currentFormValues.DeviceId || '';
let dataBaseName = '';
const deviceType = currentFormValues.DeviceType || '';
// 优先使用选中的设备信息
const deviceInfo =
@ -189,7 +193,15 @@ const gridOptions: VxeGridProps<any> = {
: null);
if (deviceInfo) {
deviceAddress = deviceInfo.deviceAddress || deviceAddress;
dataBaseName = deviceInfo.businessSystemName || '';
// 根据设备类型获取正确的 id
if (Number(deviceType) === 10) {
// 集中器类型使用 focusId
deviceId = deviceInfo.focusId || deviceId;
} else {
// 其他设备类型使用 meterId
deviceId = deviceInfo.meterId || deviceId;
}
}
// 构建查询参数
@ -197,8 +209,10 @@ const gridOptions: VxeGridProps<any> = {
pageIndex: page.currentPage,
pageSize: page.pageSize,
SearchKeyword: currentFormValues.SearchKeyword || '',
DeviceType: deviceType,
IoTDataType: currentFormValues.IoTDataType || '',
DeviceId: deviceAddress, // 直接使用设备地址
DeviceId: deviceId,
DataBaseName: dataBaseName || currentFormValues.DataBaseName || '',
StartCreationTime: formatDate(currentFormValues.StartCreationTime),
EndCreationTime: formatDate(currentFormValues.EndCreationTime),
};

75
apps/web-antd/src/views/iotdbdatamanagement/onenetLog/schema.ts
View File

@ -8,6 +8,72 @@ import { getCommonGetSelectList } from '#/api-client';
import { $t } from '#/locales';
export const querySchema = computed(() => [
{
component: 'ApiSelect',
fieldName: 'DataBaseName',
label: $t('abp.IoTDBBase.DataBaseName'),
componentProps: {
api: getCommonGetSelectList,
params: {
query: {
typeName: 'BusinessSystemEnum',
},
},
labelField: 'secondValue',
valueField: 'value',
optionsPropName: 'options',
immediate: true,
afterFetch: (res: any) => {
// 确保返回的是数组格式
if (Array.isArray(res)) {
return res;
}
// 如果是包装在 items 中的，提取出来
if (res && Array.isArray(res.items)) {
return res.items;
}
// 如果是包装在 data 中的，提取出来
if (res && Array.isArray(res.data)) {
return res.data;
}
// 如果都不是，返回空数组
return [];
},
},
},
{
component: 'ApiSelect',
fieldName: 'DeviceType',
label: $t('abp.IoTDBBase.DeviceType'),
componentProps: {
api: getCommonGetSelectList,
params: {
query: {
typeName: 'MeterTypeEnum',
},
},
labelField: 'value',
valueField: 'key',
optionsPropName: 'options',
immediate: true,
afterFetch: (res: any) => {
// 确保返回的是数组格式
if (Array.isArray(res)) {
return res;
}
// 如果是包装在 items 中的，提取出来
if (res && Array.isArray(res.items)) {
return res.items;
}
// 如果是包装在 data 中的，提取出来
if (res && Array.isArray(res.data)) {
return res.data;
}
// 如果都不是，返回空数组
return [];
},
},
},
{
component: 'ApiSelect',
fieldName: 'IoTDataType',
@ -23,8 +89,6 @@ export const querySchema = computed(() => [
valueField: 'key',
optionsPropName: 'options',
immediate: true,
allowClear: true,
placeholder: $t('common.pleaseSelect') + $t('abp.IoTDBBase.IoTDataType'),
afterFetch: (res: any) => {
// 确保返回的是数组格式
if (Array.isArray(res)) {
@ -94,7 +158,12 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
return cellValue ? dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss') : '';
},
},
{
field: 'deviceType',
title: $t('abp.IoTDBBase.DeviceType'),
minWidth: '120',
slots: {},
},
{
field: 'ioTDataType',
title: $t('abp.IoTDBBase.IoTDataType'),

3
apps/web-antd/src/views/iotdbdatamanagement/telemetryLog/index.vue
View File

@ -58,6 +58,9 @@ const [Grid] = useVbenVxeGrid({ formOptions, gridOptions });
<template>
<Page auto-content-height>
<Grid>
<template #isdeviceType="{ row }">
{{ row.deviceType }}
</template>
<template #ismanualOrNot="{ row }">
<component :is="h(Tag, { color: row.manualOrNot ? 'green' : 'red' }, () =>
row.manualOrNot ? $t('common.yes') : $t('common.no'),

19
apps/web-antd/src/views/iotdbdatamanagement/telemetryLog/schema.ts
View File

@ -19,11 +19,28 @@ export const querySchema = computed(() => [
export const tableSchema: any = computed((): VxeGridProps['columns'] => [
{ title: $t('common.seq'), type: 'seq', width: 50 },
{ field: 'dataBaseName', title: $t('abp.log.dataBaseName'), minWidth: '150' },
{
field: 'deviceAddress',
field: 'projectId',
title: $t('abp.log.projectId'),
minWidth: '150',
},
{
field: 'meterAddress',
title: $t('abp.meters.meterAddress'),
minWidth: '150',
},
{
field: 'focusAddress',
title: $t('abp.focus.focusAddress'),
minWidth: '100',
},
{
field: 'deviceType',
title: $t('abp.log.deviceType'),
minWidth: '100',
slots: { default: 'isdeviceType' },
},
{
field: 'timestamps',
title: $t('abp.log.timestamps'),