diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue index 10564da..d1a0ee5 100644 --- a/src/views/govern/device/planData/index.vue +++ b/src/views/govern/device/planData/index.vue @@ -428,10 +428,16 @@ const init = (flag: boolean) => { }) }) let lists: any = [] + let frequencys: any = null countData.value.map((item: any, index: any) => { + if (item.name.includes('间谐波电压')) { + frequencys = item.count + 0.5 + } else { + frequencys = item.count + } lists[index] = { statisticalId: item.index, - frequencys: item.count && item.count.length != 0 ? [item.count] : [] + frequencys: frequencys && frequencys.length != 0 ? [frequencys] : [] } }) let obj = { @@ -760,10 +766,10 @@ const formatCountOptions = (list: any) => { if (item.name.includes('谐波电流有效值')) { item.name = '谐波电流次数' } - if (item.name=='谐波电压含有率') { + if (item.name == '谐波电压含有率') { item.name = '谐波电压次数' } - if (item.name=='间谐波电压含有率') { + if (item.name == '间谐波电压含有率') { item.name = '间谐波电压次数' } })