diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue index c734e19..7aa4924 100644 --- a/src/views/govern/alarm/Transient.vue +++ b/src/views/govern/alarm/Transient.vue @@ -44,7 +44,7 @@ - 返回 diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue index c3acaff..924cf59 100644 --- a/src/views/govern/device/control/index.vue +++ b/src/views/govern/device/control/index.vue @@ -469,7 +469,7 @@ const deviceId: any = ref('') const lineId: any = ref('') const dataLevel: any = ref('') const nodeClick = async (e: anyObj) => { - console.log("🚀 ~ nodeClick ~ e:", e) + // console.log("🚀 ~ nodeClick ~ e:", e) if (e.level == 2) return deviceId.value = e?.pid lineId.value = e?.id @@ -585,8 +585,8 @@ const getRealDataMqttMsg = async () => { // ) let obj = JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message)))) if (lineId.value != obj.lineId && adminInfo.userIndex != obj.userId) return - console.log("🚀 ~ mqttRef.value.on ~ obj:", obj) - console.log("🚀 ~ mqttRef.value.on ~ formInline.dataLevel:", obj.dataLevel, formInline.dataLevel) + // console.log("🚀 ~ mqttRef.value.on ~ obj:", obj) + // console.log("🚀 ~ mqttRef.value.on ~ formInline.dataLevel:", obj.dataLevel, formInline.dataLevel) //处理mqtt数据 1转2除 2转1乘 //如果消息返回值是二次值，下拉框是二次值只需要单位换算 除以1000 @@ -624,36 +624,36 @@ const getRealDataMqttMsg = async () => { obj = { ...obj, // 电压有效值 - vRmsA: ((obj.vRmsA * obj.pt) || 0) / 1000, - vRmsB: ((obj.vRmsA * obj.pt) || 0) / 1000, - vRmsC: ((obj.vRmsA * obj.pt) || 0) / 1000, + vRmsA: ((obj.vRmsA * obj.pt)) / 1000, + vRmsB: ((obj.vRmsA * obj.pt)) / 1000, + vRmsC: ((obj.vRmsA * obj.pt)) / 1000, // 电流有效值 - iRmsA: (obj.iRmsA * obj.ct) || 0, - iRmsB: (obj.iRmsA * obj.ct) || 0, - iRmsC: (obj.iRmsA * obj.ct) || 0, + iRmsA: (obj.iRmsA * obj.ct), + iRmsB: (obj.iRmsA * obj.ct), + iRmsC: (obj.iRmsA * obj.ct), //基波电压幅值 - v1A: ((obj.v1A * obj.pt) || 0) / 1000, - v1B: ((obj.v1B * obj.pt) || 0) / 1000, - v1C: ((obj.v1C * obj.pt) || 0) / 1000, + v1A: ((obj.v1A * obj.pt)) / 1000, + v1B: ((obj.v1B * obj.pt)) / 1000, + v1C: ((obj.v1C * obj.pt)) / 1000, //基波电流幅值 - i1A: (obj.i1A * obj.ct) || 0, - i1B: (obj.i1B * obj.ct) || 0, - i1C: (obj.i1C * obj.ct) || 0, + i1A: (obj.i1A * obj.ct), + i1B: (obj.i1B * obj.ct), + i1C: (obj.i1C * obj.ct), //有功功率 - pA: ((obj.pA * obj.pt * obj.ct) || 0) / 1000, - pB: ((obj.pB * obj.pt * obj.ct) || 0) / 1000, - pC: ((obj.pC * obj.pt * obj.ct) || 0) / 1000, - pTot: ((obj.pTot * obj.pt * obj.ct) || 0) / 1000, + pA: ((obj.pA * obj.pt * obj.ct)) / 1000, + pB: ((obj.pB * obj.pt * obj.ct)) / 1000, + pC: ((obj.pC * obj.pt * obj.ct)) / 1000, + pTot: ((obj.pTot * obj.pt * obj.ct)) / 1000, //无功功率 - qA: ((obj.qA * obj.pt * obj.ct) || 0) / 1000, - qB: ((obj.qB * obj.pt * obj.ct) || 0) / 1000, - qC: ((obj.qC * obj.pt * obj.ct) || 0) / 1000, - qTot: ((obj.qTot * obj.pt * obj.ct) || 0) / 1000, + qA: ((obj.qA * obj.pt * obj.ct)) / 1000, + qB: ((obj.qB * obj.pt * obj.ct)) / 1000, + qC: ((obj.qC * obj.pt * obj.ct)) / 1000, + qTot: ((obj.qTot * obj.pt * obj.ct)) / 1000, //视在功率 - sA: ((obj.sA * obj.pt * obj.ct) || 0) / 1000, - sB: ((obj.sB * obj.pt * obj.ct) || 0) / 1000, - sC: ((obj.sC * obj.pt * obj.ct) || 0) / 1000, - sTot: ((obj.sTot * obj.pt * obj.ct) || 0) / 1000 + sA: ((obj.sA * obj.pt * obj.ct)) / 1000, + sB: ((obj.sB * obj.pt * obj.ct)) / 1000, + sC: ((obj.sC * obj.pt * obj.ct)) / 1000, + sTot: ((obj.sTot * obj.pt * obj.ct)) / 1000 } } //如果消息返回值是一次值，下拉框是二次值需要单位换算 乘以1000 并且除以pt ct diff --git a/src/views/govern/device/control/offLineDataImport/index.vue b/src/views/govern/device/control/offLineDataImport/index.vue index c1b2fe5..d09996b 100644 --- a/src/views/govern/device/control/offLineDataImport/index.vue +++ b/src/views/govern/device/control/offLineDataImport/index.vue @@ -25,7 +25,7 @@
- + diff --git a/src/views/govern/device/control/tabs/components/harmonicSpectrum.vue b/src/views/govern/device/control/tabs/components/harmonicSpectrum.vue index 5bf0069..a64a60d 100644 --- a/src/views/govern/device/control/tabs/components/harmonicSpectrum.vue +++ b/src/views/govern/device/control/tabs/components/harmonicSpectrum.vue @@ -283,9 +283,11 @@ const setChildRef = (index: any) => { const childRefs: any = {} const init = () => { loading.value = true + searchForm.value.index.map((item: any, index: any) => { item?.children.map((vv: any, vvs: any) => { - if (mqttMessage.value[vv.name]) { + if (mqttMessage.value[vv.name] !=undefined) { + item.data.push({ // time: mqttMessage.value.dataTime, value: mqttMessage.value[vv.name], @@ -301,6 +303,7 @@ const init = () => { xAixsTimeList.value.push(mqttMessage.value.dataTime.split(" ")[1]) + searchForm.value.index.map((item: any, index: any) => { //循环渲染图表 @@ -360,6 +363,7 @@ const init = () => { ? (height = mainHeight(275, 3).height) : (height = mainHeight(275, searchForm.value.index.length).height) item.children.map((zz: any, zzIndex: any) => { + item.echartsData.series.push({ name: zz.phase, type: 'line', diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue index b453b76..4c2b0b4 100644 --- a/src/views/govern/device/planData/index.vue +++ b/src/views/govern/device/planData/index.vue @@ -98,7 +98,7 @@ -
+

历史趋势

diff --git a/src/views/govern/reportForms/look.vue b/src/views/govern/reportForms/look.vue index ba06ec9..266ffed 100644 --- a/src/views/govern/reportForms/look.vue +++ b/src/views/govern/reportForms/look.vue @@ -12,7 +12,7 @@ 导入excel 导出excel - 返回 + 返回
diff --git a/src/views/govern/reportForms/luckysheet.vue b/src/views/govern/reportForms/luckysheet.vue index 7d3eff6..a02e58d 100644 --- a/src/views/govern/reportForms/luckysheet.vue +++ b/src/views/govern/reportForms/luckysheet.vue @@ -13,7 +13,7 @@ 导出excel 保存 - 返回 + 返回
diff --git a/src/views/system/reportForms/look.vue b/src/views/system/reportForms/look.vue index ba06ec9..266ffed 100644 --- a/src/views/system/reportForms/look.vue +++ b/src/views/system/reportForms/look.vue @@ -12,7 +12,7 @@ 导入excel 导出excel - 返回 + 返回
diff --git a/src/views/system/reportForms/luckysheet.vue b/src/views/system/reportForms/luckysheet.vue index 7d3eff6..a02e58d 100644 --- a/src/views/system/reportForms/luckysheet.vue +++ b/src/views/system/reportForms/luckysheet.vue @@ -13,7 +13,7 @@ 导出excel 保存 - 返回 + 返回