diff --git a/src/api/module/transfer/index.ts b/src/api/module/transfer/index.ts index 40453a7..15a9e26 100644 --- a/src/api/module/transfer/index.ts +++ b/src/api/module/transfer/index.ts @@ -17,6 +17,7 @@ export const getDeviceDetails = (params: IGetDeviceDataParams) => url: `/api/query`, method: 'POST', data: params, + timeout: 0, }) export interface ISite { @@ -66,7 +67,7 @@ export interface IPointGroupOV { id: number | string, ip: string, name: string, - cnName:string + cnName: string port: number, slave_addr: number | string, type: string, diff --git a/src/views/stationData/transfer/components/deviceDrawer.vue b/src/views/stationData/transfer/components/deviceDrawer.vue index e8d4ae7..ccbd3ce 100644 --- a/src/views/stationData/transfer/components/deviceDrawer.vue +++ b/src/views/stationData/transfer/components/deviceDrawer.vue @@ -17,7 +17,8 @@ :siteInfo="props.siteInfo" ref="pointGroupTreeRef"/> -
@@ -171,6 +172,7 @@ const axisData = new Set() const legends = ref<{ addr: string; label: string, unit: string }[]>([]) const loadingChart = ref(false) +const loading = ref(false) const chartAllTotal = ref(0) const chartLimit = ref(1000) const chartOffset = ref(0) @@ -207,10 +209,11 @@ async function loadChardData() { offset } - loadingChart.value = true + loading.value = true isShowChart.value = false const res = await getDeviceDetails(params) - + loading.value = false + loadingChart.value = true if (res.code !== 0) { resetChartStatus() message.error('获取设备数据失败')