diff --git a/ui/dasadmin/src/api/backend/deviceModel/request.ts b/ui/dasadmin/src/api/backend/deviceModel/request.ts index 15acc000..857188b9 100644 --- a/ui/dasadmin/src/api/backend/deviceModel/request.ts +++ b/ui/dasadmin/src/api/backend/deviceModel/request.ts @@ -151,7 +151,7 @@ export const getDeviceTypeEnumReq = () => { }) } -export const getRealValueListReq = (data: { deviceId: string, attributes?: string[] }[]) => { +export const getRealValueListReq = (data: { deviceId: string, attributes?: (string | number)[] }[]) => { return createAxios>({ url: '/api/data/snapshot', method: 'post', diff --git a/ui/dasadmin/src/views/backend/WindBlower/index.vue b/ui/dasadmin/src/views/backend/WindBlower/index.vue index b768583e..44ed0b38 100644 --- a/ui/dasadmin/src/views/backend/WindBlower/index.vue +++ b/ui/dasadmin/src/views/backend/WindBlower/index.vue @@ -584,7 +584,7 @@ const initTrendChart = (type: 'day' | 'month') => { top: 30, right: 10, bottom: 20, - left: 25, + left: 45, borderColor: '#dadada', }, tooltip: { @@ -1372,14 +1372,21 @@ const sendManualCommand = (type: 1 | 0) => { } const getAlarmList = () => { - const start = dayjs().subtract(3, 'day').startOf('day').toDate().getTime() + const start = dayjs().startOf('day').toDate().getTime() const end = dayjs().endOf('day').toDate().getTime() - + console.log({ + startTime: start, + endTime: end, + deviceCode: [route.query.deviceCode], + },'----------------------------------'); + getAlarmListReq({ startTime: start, endTime: end, - deviceCode: [route.query.name], + deviceCode: [route.query.deviceCode], }).then((res) => { + console.log(res,'------------------------'); + if (res.rows) { tableData.value = res.rows.map((item: any) => { return { diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue index b3b8770a..918a2172 100644 --- a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue +++ b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue @@ -39,6 +39,10 @@ > +
+ 测点选择 + 数据导出 +
- +
@@ -119,6 +123,24 @@ >电网故障停机 +
+
+ + {{ scope.row }} + + +
+
+ + diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/selectPoint.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/selectPoint.vue new file mode 100644 index 00000000..e60d9778 --- /dev/null +++ b/ui/dasadmin/src/views/backend/equipment/airBlower/selectPoint.vue @@ -0,0 +1,278 @@ + + + + + diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/type.ts b/ui/dasadmin/src/views/backend/equipment/airBlower/type.ts index 4e0451a7..91619566 100644 --- a/ui/dasadmin/src/views/backend/equipment/airBlower/type.ts +++ b/ui/dasadmin/src/views/backend/equipment/airBlower/type.ts @@ -24,6 +24,8 @@ export type TableDataObjType = { itempnacelle_1sec: string ihydrpress: string ipitchangle: string +} & { + [key: string]: any } export type TableColumnSortType = { type?: 'default' | 'selection' | 'index' | 'expand' diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue index 0fc26d7c..ef5185a2 100644 --- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue +++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue @@ -390,6 +390,7 @@ const initChart = (data: { values: number[]; times: number[] }) => { const times = data?.times.map((item) => dayjs(item).format('YYYY-MM-DD HH:mm:ss')) const option = { + animation: false, grid: { top: 50, right: 23, @@ -476,7 +477,7 @@ const initChart = (data: { values: number[]; times: number[] }) => { }, smooth: 0.6, symbol: 'none', - data: data?.values ?? [], + data: data?.values ?? [] }, ], }