diff --git a/src/views/govern/device/control/detail.vue b/src/views/govern/device/control/detail.vue index 30536a5..6feab29 100644 --- a/src/views/govern/device/control/detail.vue +++ b/src/views/govern/device/control/detail.vue @@ -60,7 +60,7 @@ const init = () => { echartsData.value = null loading.value = true getDeviceDataTrend({ - devId:props.detail.pid, + devId:props.detail.devId, endTime: datePickerRef.value.timeValue[1], lineId: props.detail.lineId, startTime: datePickerRef.value.timeValue[0], diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue index 59a6842..d8ebffe 100644 --- a/src/views/govern/device/control/index.vue +++ b/src/views/govern/device/control/index.vue @@ -329,7 +329,8 @@ const handleReturn = () => { } const getDeviceDataTrend = (e: any) => { detail.value = { - lineId: formInline.lineId, + devId: deviceId.value, + lineId: lineId.value, ...e } } @@ -459,9 +460,6 @@ const handleClick = async (tab?: any) => { } ] } - // await getTabsDataByType(obj).then(res => { - // console.log(res, '趋势数据结果') - // }) trendRef.value && trendRef.value.getTrendRequest(obj) } //查询实时数据 @@ -495,9 +493,6 @@ const handleClick = async (tab?: any) => { } //暂态事件表格请求参数 eventRef.value && eventRef.value.getTableParams(obj) - // await getTabsDataByType(obj).then(res => { - // console.log(res, '0000000') - // }) } //查询当前指标 if (!dataSet.value.includes('_')) { @@ -590,7 +585,6 @@ watch( watch( () => tableData.value, (val: any, oldVal: any) => { - // console.log(val, '==========', oldVal) } ) onMounted(() => {})