diff --git a/src/utils/dictionary.ts b/src/utils/dictionary.ts index 0572169f..15387f71 100644 --- a/src/utils/dictionary.ts +++ b/src/utils/dictionary.ts @@ -169,6 +169,7 @@ export const indexOptions = [ ] //谐波次数 export const harmonicOptions = [ + { label: '基波', value: 1 }, { label: '2次', value: 2 }, { label: '3次', value: 3 }, { label: '4次', value: 4 }, diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue index a1fd82ff..1900e2f0 100644 --- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue +++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue @@ -71,7 +71,7 @@ const formData = reactive<{ searchEndTime: '', condition: ['10', '11', '12'], valueType: 1, - harmonic: 2, + harmonic: 1, inHarmonic: 1, ptType: 0 }) @@ -1092,10 +1092,27 @@ const shujuchuli = (res: any) => { } const rendering = () => { height.value = mainHeight(200, list.value.length > 1 ? 2 : 1) + list.value.forEach((item: any) => { + if (item.targetName == '电压不平衡') { + + item.valueName = '' + item.legend = item.legend.map((item2: any) => { + if (item2 == '零序电压') { + item2 = item2 + '(V)' + } else if (item2 == '正序电压') { + item2 = item2 + '(kV)' + } else if (item2 == '负序电压') { + item2 = item2 + '(V)' + } + return item2 + }) + + } + let opitonserise: any[] = [] item.legend.forEach((item2: any) => { - if (item.avalue !== undefined && (item2 == 'A相' || item2 == 'AB相' || item2 == '零序电压')) { + if (item.avalue !== undefined && (item2 == 'A相' || item2 == 'AB相' || item2 == '零序电压(V)')) { let data = { name: item2, symbol: 'none', @@ -1111,7 +1128,7 @@ const rendering = () => { data: item.avalue } opitonserise.push(data) - } else if (item.bvalue !== undefined && (item2 == 'B相' || item2 == 'BC相' || item2 == '正序电压')) { + } else if (item.bvalue !== undefined && (item2 == 'B相' || item2 == 'BC相' || item2 == '正序电压(kV)')) { let data = { name: item2, symbol: 'none', @@ -1127,7 +1144,7 @@ const rendering = () => { data: item.bvalue } opitonserise.push(data) - } else if (item.cvalue !== undefined && (item2 == 'C相' || item2 == 'CA相' || item2 == '负序电压')) { + } else if (item.cvalue !== undefined && (item2 == 'C相' || item2 == 'CA相' || item2 == '负序电压(V)')) { let data = { name: item2, symbol: 'none', @@ -1356,17 +1373,17 @@ const getEcharts = () => { : params[i].value[1] == 0 ? '总谐波电流方向:无
' : '总谐波电流方向:流出
' - } else if (params[i].seriesName == '正序电压') { + } 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,') - tips += params[i].seriesName + ':' + str1 + 'kV
' - } else if (params[i].seriesName == '零序电压' || params[i].seriesName == '负序电压') { + tips += params[i].seriesName.replace("(kV)", "") + ':' + str1 + '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,') - tips += params[i].seriesName + ':' + str1 + 'V
' - } else if (params[i].seriesName !== '正序电压') { + tips += params[i].seriesName.replace("(V)", "") + ':' + str1 + '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,') @@ -1407,8 +1424,8 @@ const getEcharts = () => { } }, grid: { - top: '70px', - }, + top: '70px', + }, xAxis: [ { type: 'time', diff --git a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue index 0fbfb46a..9e3a6d4a 100644 --- a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue +++ b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue @@ -2,40 +2,34 @@
- + +