Web/admin-govern
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

间谐波次数修改

Browse Source
This commit is contained in:
zhujiyan
2024-11-01 14:51:59 +08:00
parent 4cc8f107a1
commit c407b7ef57
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/views/govern/device/control/tabs/trend.vue
View File

@@ -194,10 +194,16 @@ const init = async () => {
})
})
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]
frequencys: frequencys && frequencys.length != 0 ? [frequencys] : []
}
})
let obj = {
@@ -550,6 +556,15 @@ const formatCountOptions = (list: any) => {
if (kk.harmStart && kk.harmEnd) {
range(0, 0, 0)
countData.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1)
if (kk.showName == '间谐波电压含有率') {
countData.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
(item: any) => {
return item - 0.5
}
)
} else {
countData.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1)
}
//添加默认值
if (countData.value[index].count.length == 0) {
countData.value[index].count = countData.value[index].countOptions[0]
@@ -560,11 +575,11 @@ const formatCountOptions = (list: any) => {
})
})
countData.value.map((item: any, key: any) => {
if (item.name.includes('谐波电流有效值')) {
if (item.name == '谐波电流有效值') {
item.name = '谐波电流次数'
} else if (item.name.includes('谐波电压含有率')) {
} else if (item.name == '谐波电压含有率') {
item.name = '谐波电压次数'
} else if (item.name.includes('间谐波电压含有率')) {
} else if (item.name == '间谐波电压含有率') {
item.name = '间谐波电压次数'
}
})

2
src/views/govern/device/planData/index.vue
View File

@@ -745,7 +745,7 @@ const formatCountOptions = (list: any) => {
if (kk.harmStart && kk.harmEnd) {
range(0, 0, 0)
if (kk.showName.includes('间谐波电压含有率')) {
if (kk.showName=='间谐波电压含有率') {
countData.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
(item: any) => {
return item - 0.5