diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
index fc9ea70d..039537bb 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
@@ -1448,7 +1448,7 @@ const rendering = () => {
}
const getEcharts = () => {
list.value.forEach((item: any, i: number) => {
- console.log('🚀 ~ getEcharts ~ item:', item)
+
const values = item.value && item.value.length > 0 ? item.value.map(k => k[1]) : [0]
let [min, max] = yMethod([item.maxValue, item.minValue, ...values])
@@ -1490,11 +1490,12 @@ const getEcharts = () => {
let tips = ''
tips += '时刻:' + params[0].data[0] + ''
for (let i = 0; i < params.length; i++) {
- console.log('🚀 ~ file: index.vue ~ line 107 ~ params:', params)
+
+
if (params[i].seriesName == '暂态触发点') {
tips += ''
- console.log('tips', tips)
+
return tips
}
if (params[i].seriesName == 'A相谐波电流方向') {
@@ -1529,41 +1530,50 @@ const getEcharts = () => {
let str = (params[i].value[1] * 1).toString()
let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
let str1 = str.replace(reg, '$1,')
+ let cleanStr = str1.replace(/,/g, '')
+ let num = Number(cleanStr)
tips +=
params[i].marker +
params[i].seriesName.replace('(kV)', '') +
':' +
- (Number.isNaN(Number(str1)) ? '/' : str1) +
+ (Number.isNaN(Number(num)) ? '/' : num) +
'kV
'
} else if (params[i].seriesName == '零序电压(V)' || params[i].seriesName == '负序电压(V)') {
let str = (params[i].value[1] * 1).toString()
let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
let str1 = str.replace(reg, '$1,')
+ let cleanStr = str1.replace(/,/g, '')
+ let num = Number(cleanStr)
tips +=
params[i].marker +
params[i].seriesName.replace('(V)', '') +
':' +
- (Number.isNaN(Number(str1)) ? '/' : str1) +
+ (Number.isNaN(Number(num)) ? '/' : num) +
'V
'
} else if (params[i].seriesName !== '正序电压(kV)') {
let str = (params[i].value[1] * 1).toString()
let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
let str1 = str.replace(reg, '$1,')
+ let cleanStr = str1.replace(/,/g, '')
+ let num = Number(cleanStr)
tips +=
params[i].marker +
params[i].seriesName +
':' +
- (Number.isNaN(Number(str1)) ? '/' : str1) +
+ (Number.isNaN(Number(num)) ? '/' : num) +
'
'
} else {
let str = (params[i].value[2] * 1).toString()
+
let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
let str1 = str.replace(reg, '$1,')
+ let cleanStr = str1.replace(/,/g, '')
+ let num = Number(cleanStr)
tips +=
params[i].marker +
params[i].seriesName +
':' +
- (Number.isNaN(Number(str1)) ? '/' : str1) +
+ (Number.isNaN(Number(num)) ? '/' : num) +
'
'
let str2 = (params[i].value[3] * 1).toString()
@@ -1579,7 +1589,7 @@ const getEcharts = () => {
(Number.isNaN(Number(str2)) ? '/' : str2) +
'
'
- console.log('其他tips',tips)
+
}
}