diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue index 0de9383..c821ae8 100644 --- a/src/views/govern/device/control/index.vue +++ b/src/views/govern/device/control/index.vue @@ -729,7 +729,7 @@ const handleHarmonicSpectrum = async () => { // } realTimeFlag.value = false sonTab.value = 2 - harmonicSpectrumRef.value && harmonicSpectrumRef.value.resetData() + harmonicSpectrumRef.value && harmonicSpectrumRef.value.resetData(formInline.dataLevel) // getRealDataMqttMsg() await getBasicRealData(lineId.value).then((res: any) => { if (res.code == 'A0000') { @@ -991,35 +991,37 @@ const getRealDataMqttMsg = async () => { //如果消息返回值是二次值,下拉框是二次值只需要单位换算 除以1000 //如果消息返回值是一次值,下拉框是一次值只需要单位换算 除以1000 if (obj.dataLevel == formInline.dataLevel) { + obj = { ...obj, // 电压有效值 - vRmsA: obj.vRmsA / 1000, - vRmsB: obj.vRmsB / 1000, - vRmsC: obj.vRmsC / 1000, + vRmsA: obj.vRmsA , + vRmsB: obj.vRmsB , + vRmsC: obj.vRmsC , //基波电压幅值 - v1A: obj.v1A / 1000, - v1B: obj.v1B / 1000, - v1C: obj.v1C / 1000, + v1A: obj.v1A , + v1B: obj.v1B , + v1C: obj.v1C , //有功功率 - pA: obj.pA / 1000, - pB: obj.pB / 1000, - pC: obj.pC / 1000, - pTot: obj.pTot / 1000, + pA: obj.pA , + pB: obj.pB , + pC: obj.pC , + pTot: obj.pTot , //无功功率 - qA: obj.qA / 1000, - qB: obj.qB / 1000, - qC: obj.qC / 1000, - qTot: obj.qTot / 1000, + qA: obj.qA , + qB: obj.qB , + qC: obj.qC , + qTot: obj.qTot , //视在功率 - sA: obj.sA / 1000, - sB: obj.sB / 1000, - sC: obj.sC / 1000, - sTot: obj.sTot / 1000 + sA: obj.sA , + sB: obj.sB , + sC: obj.sC , + sTot: obj.sTot } } //如果消息返回值是二次值,下拉框是一次值需要单位换算 除以1000 并且乘以pt ct if (obj.dataLevel == 'Secondary' && formInline.dataLevel == 'Primary') { + obj = { ...obj, // 电压有效值 @@ -1102,7 +1104,7 @@ const getRealDataMqttMsg = async () => { mqttMessage.value = obj //更新实时数据主页面值 - realTimeFlag.value && realTimeRef.value && realTimeRef.value.setRealData(mqttMessage.value) + realTimeFlag.value && realTimeRef.value && realTimeRef.value.setRealData(mqttMessage.value,formInline.dataLevel) tableLoading.value = false //更新实时趋势折线图数据 if (sonTab.value == 2) { diff --git a/src/views/govern/device/control/tabs/components/harmonicSpectrum.vue b/src/views/govern/device/control/tabs/components/harmonicSpectrum.vue index 60ca871..aed4be4 100644 --- a/src/views/govern/device/control/tabs/components/harmonicSpectrum.vue +++ b/src/views/govern/device/control/tabs/components/harmonicSpectrum.vue @@ -144,7 +144,8 @@ let height: any = mainHeight(275).height const loading = ref(false) const allDataList: any = ref([]) const xAixsTimeList: any = ref([]) -const resetData = () => { + +const resetData = (dataLevel: string) => { loading.value = true indexOptions.value = [ { @@ -155,7 +156,7 @@ const resetData = () => { { name: 'vRmsB', phase: 'B相', data: [], yMethodList: [] }, { name: 'vRmsC', phase: 'C相', data: [], yMethodList: [] } ], - unit: 'kV', + unit: dataLevel === 'Primary' ? 'kV' : 'V', data: [], yMethodList: [] }, @@ -180,7 +181,7 @@ const resetData = () => { { name: 'pC', phase: 'C相', data: [], yMethodList: [] }, { name: 'pTot', phase: '总', data: [], yMethodList: [] } ], - unit: 'kW', + unit: dataLevel === 'Primary' ? 'kW' : 'W', data: [], yMethodList: [] }, @@ -193,7 +194,7 @@ const resetData = () => { { name: 'qC', phase: 'C相', data: [], yMethodList: [] }, { name: 'qTot', phase: '总', data: [], yMethodList: [] } ], - unit: 'kW', + unit: dataLevel === 'Primary' ? 'kVar' : 'Var', data: [], yMethodList: [] }, @@ -206,7 +207,7 @@ const resetData = () => { { name: 'v1B', phase: 'B相', data: [], yMethodList: [] }, { name: 'v1C', phase: 'C相', data: [], yMethodList: [] } ], - unit: 'kV', + unit: dataLevel === 'Primary' ? 'kV' : 'V', data: [], yMethodList: [] }, @@ -255,9 +256,10 @@ const resetData = () => { allDataList.value = [] xAixsTimeList.value = [] } -resetData() +resetData('Primary') const mqttMessage: any = ref() const setHarmonicSpectrumData = (val: any) => { + mqttMessage.value = val init() } @@ -307,7 +309,6 @@ const init = () => { //循环渲染图表 const refName = setChildRef(index) childRefs[refName] = ref(null) // 初始化ref - item.echartsData = { title: { text: item.name diff --git a/src/views/govern/device/control/tabs/realtime.vue b/src/views/govern/device/control/tabs/realtime.vue index 219b0f1..aa9464b 100644 --- a/src/views/govern/device/control/tabs/realtime.vue +++ b/src/views/govern/device/control/tabs/realtime.vue @@ -5,7 +5,7 @@