diff --git a/src/api/iot/deviceOperationOverview/index.ts b/src/api/iot/deviceOperationOverview/index.ts
index 8b3601c6..335a0006 100644
--- a/src/api/iot/deviceOperationOverview/index.ts
+++ b/src/api/iot/deviceOperationOverview/index.ts
@@ -2,6 +2,7 @@ import request from '@/config/axios'
export interface DeviceOperationOverviewParams {
ids?: string
+ deviceType?: number
startTime?: string
endTime?: string
timelinePageNo?: number
diff --git a/src/api/iot/deviceOperationRecord/index.ts b/src/api/iot/deviceOperationRecord/index.ts
index c9821005..f125d5d9 100644
--- a/src/api/iot/deviceOperationRecord/index.ts
+++ b/src/api/iot/deviceOperationRecord/index.ts
@@ -21,6 +21,7 @@ export interface DeviceOperationRecordVO {
export interface DeviceOperationRecordPageParams {
pageNo: number
pageSize: number
+ deviceType?: number
deviceCode?: string
deviceName?: string
startTime?: string
diff --git a/src/api/mes/organization/index.ts b/src/api/mes/organization/index.ts
index 9ce33969..24c3b6b4 100644
--- a/src/api/mes/organization/index.ts
+++ b/src/api/mes/organization/index.ts
@@ -73,7 +73,12 @@ export const OrganizationApi = {
return await request.download({ url: `/mes/organization/export-excel`, params })
},
- deviceParameterAnalysis: async (params: { keyword?: string, showDevices?: number, filterNoDeviceLine?: number }) => {
+ deviceParameterAnalysis: async (params: {
+ keyword?: string
+ deviceType?: number
+ showDevices?: number
+ filterNoDeviceLine?: number
+ }) => {
return await request.get({ url: `/mes/device-line/deviceParameterAnalysis`, params })
}
}
diff --git a/src/views/iot/device/DeviceForm.vue b/src/views/iot/device/DeviceForm.vue
index 2bbb84e3..3db6fcd3 100644
--- a/src/views/iot/device/DeviceForm.vue
+++ b/src/views/iot/device/DeviceForm.vue
@@ -44,6 +44,16 @@
+
+
+
+
+
@@ -102,10 +112,9 @@