实时数据-页面调整&接口调试&数据计算

src/api/cs-device-boot/EquipmentDelivery.ts

@@ -1,7 +1,7 @@
 import createAxios from '@/utils/request'
 
 // 装置基础数据和模板数据
-export function getDeviceData(deviceId: string, type: string, lineId:string) {
+export function getDeviceData(deviceId: string, type: string, lineId: string) {
     let form = new FormData()
     form.append('deviceId', deviceId)
     form.append('lineId', lineId)
@@ -25,6 +25,22 @@ export function getTabsDataByType(data: any) {
     })
 }
 
+/**** 获取基础实施数据 ****/
+export function getBasicRealData(id: any) {
+    return createAxios({
+        url: `/cs-harmonic-boot/realData/getBaseRealData?lineId=${id}`,
+        method: 'POST'
+    })
+}
+
+/**** 获取谐波实时数据 ****/
+export function getHarmRealData(target: any) {
+    return createAxios({
+        url: `/cs-harmonic-boot/realData/getHarmRealData?lineId=${id}&target=${target}`,
+        method: 'POST'
+    })
+}
+
 //获取实时数据列表数据
 export function getRealTimeTableList() {
     return createAxios({

src/views/govern/device/control/index.vue

@@ -110,6 +110,12 @@
                         </el-select>
                     </el-form-item>
                     <el-button type="primary" icon="el-icon-Search" @click="handleClick">查询</el-button>
+                    <el-button type="primary" v-if="realTimeFlag" :icon="DataLine" @click="handleHarmonicSpectrum">
+                        实时趋势
+                    </el-button>
+                    <el-button type="primary" v-if="realTimeFlag" :icon="TrendCharts" @click="handleTrend">
+                        谐波频谱
+                    </el-button>
                 </el-form>
                 <div
                     style="height: calc(100vh - 300px)"
@@ -242,15 +248,15 @@
                     v-if="dataSet.indexOf('_realtimedata') != -1"
                     v-loading="tableLoading"
                 >
-                    <div class="view_top_btn" v-if="realTimeFlag">
+                    <!-- <div class="view_top_btn" v-if="realTimeFlag">
-                        <!-- <el-button type="primary"  :icon="Platform" @click="handleRecordWaves">
+                        <el-button type="primary"  :icon="Platform" @click="handleRecordWaves">
                             实时录波
-                        </el-button> -->
+                        </el-button>
                         <el-button type="primary" :icon="DataLine" @click="handleHarmonicSpectrum">实时趋势</el-button>
                         <el-button type="primary" :icon="TrendCharts" @click="handleTrend">谐波频谱</el-button>
-                    </div>
+                    </div> -->
                     <div class="view_top_btn" v-if="!realTimeFlag">
-                        <el-button type="primary" :icon="ArrowLeft" @click="handleReturn">返回</el-button>
+                        <el-button :icon="Back" @click="handleReturn">返回</el-button>
                     </div>
                     <!-- 实时数据主界面组件 -->
                     <realTime v-if="realTimeFlag" ref="realTimeRef"></realTime>
@@ -288,9 +294,9 @@ import Detail from './detail.vue'
 import PointTree from '@/components/tree/govern/pointTree.vue'
 import { mainHeight } from '@/utils/layout'
 import { queryByCode, queryByid, queryCsDictTree } from '@/api/system-boot/dictTree'
-import { getDeviceData, getTabsDataByType } from '@/api/cs-device-boot/EquipmentDelivery'
+import { getDeviceData, getTabsDataByType, getBasicRealData } from '@/api/cs-device-boot/EquipmentDelivery'
 import { deviceHisData, deviceRtData, getGroup } from '@/api/cs-device-boot/csGroup'
-import { ref, reactive, nextTick, onMounted, watch } from 'vue'
+import { ref, reactive, nextTick, onMounted, watch, onUnmounted } from 'vue'
 import { ElMessage } from 'element-plus'
 import DatePicker from '@/components/form/datePicker/index.vue'
 import Trend from './tabs/trend.vue' //趋势数据
@@ -301,6 +307,7 @@ import recordWoves from './tabs/components/recordwoves.vue' //实时数据-实
 import offLineDataImport from './offLineDataImport/index.vue'
 import Event from './tabs/event.vue'
 import { useRouter } from 'vue-router'
+import TableHeader from '@/components/table/header/index.vue'
 import { defineConfig, loadEnv } from 'vite'
 import type { UserConfig, ConfigEnv } from 'vite'
 import {
@@ -312,9 +319,11 @@ import {
     DataAnalysis,
     Odometer,
     Monitor,
-    Timer
+    Timer,
+    Back
 } from '@element-plus/icons-vue'
 import analysisList from './analysisList/index.vue'
+import mqtt from 'mqtt'
 defineOptions({
     name: 'govern/device/control'
 })
@@ -472,23 +481,42 @@ const pointTypeChange = (val: any, obj: any) => {
     nodeClick(obj)
 }
 const realTimeRef: any = ref()
-const intRealTime = async (val: any) => {
+
-    await getTabsDataByType(val).then(res => {
-        realTimeRef.value && realTimeRef.value.getRealTimeData(res.data)
-    })
-    timer.value = window.setInterval(async () => {
-        await getTabsDataByType(val).then(res => {
-            realTimeRef.value && realTimeRef.value.getRealTimeData(res.data)
-        })
-    }, 5000)
-}
 //趋势数据组件
 const trendRef: any = ref()
 //暂态事件组件
 const eventRef: any = ref()
 const timer: any = ref()
+
+const mqttRef = ref()
+
+const connectMqtt = () => {
+    if (mqttRef.value) {
+        if (mqttRef.value.connected) {
+            return
+        }
+    }
+    const options: any = {
+        protocolId: 'MQTT',
+        qos: 2,
+        clean: true,
+        connectTimeout: 30 * 1000,
+        clientId: 'mqttjs' + Math.random(),
+        username: 't_user',
+        password: 'njcnpqs'
+    }
+    // 线上
+    // const url = 'wss://pqmcn.com:8087/mqtt'
+    const url = 'ws://192.168.1.24:8085/mqtt'
+    mqttRef.value = mqtt.connect(url, options)
+}
 //tab点击事件
+
+const realDataTimer: any = ref()
 const handleClick = async (tab?: any) => {
+    if (realDataTimer.value) {
+        window.clearInterval(realDataTimer.value)
+    }
     tableLoading.value = true
     //点击tab时更新dataSet最新值
     if (tab && tab.props && tab.props.name && dataSet.value != tab.props.name) {
@@ -548,6 +576,7 @@ const handleClick = async (tab?: any) => {
     }
     //查询实时数据
     if (dataSet.value.includes('_realtimedata')) {
+        console.log(66666)
         //查询实时数据显示实时录波、实时趋势、谐波频谱
         realTimeFlag.value = true
         let obj = {
@@ -556,10 +585,163 @@ const handleClick = async (tab?: any) => {
             devId: deviceId.value, //e.id
             lineId: lineId.value //e.pid
         }
-        intRealTime(obj)
         setTimeout(() => {
             tableLoading.value = false
         }, 1500)
+
+        //新的实时数据
+        //1.调用接口
+        getBasicRealData(lineId.value).then((res: any) => {
+            console.log(res, '获取基础实时数据')
+        })
+        //2.建立mqtt通讯
+
+        const mqttMessage = ref<any>({})
+
+        //每隔30s调用一下接口，通知后台推送mqtt消息
+        realDataTimer.value = setInterval(() => {
+            getBasicRealData(lineId.value).then((res: any) => {
+                console.log(res, '获取基础实时数据')
+            })
+        }, 30000)
+        connectMqtt()
+        mqttRef.value.on('connect', (e: any) => {
+            // ElMessage.success('连接mqtt服务器成功!')
+            console.log('mqtt客户端已连接....')
+            // mqttRef.value.subscribe('/Web/Progress')
+            mqttRef.value.subscribe('/Web/RealData/+')
+            //假数据
+        })
+
+        mqttRef.value.on('message', (topic: any, message: any) => {
+            // console.log('mqtt接收到消息', message,topic)
+            console.log('mqtt接收到消息', JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message)))))
+            let obj = JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
+            console.log(obj, '620=================>')
+            //处理mqtt数据 1转2除 2转1乘
+            //如果消息返回值是二次值，下拉框是二次值只需要单位换算 除以1000
+            //如果消息返回值是一次值，下拉框是一次值只需要单位换算 除以1000
+            if (obj.dataLevel == formInline.dataLevel) {
+                obj = {
+                    ...obj,
+                    // 电压有效值
+                    vRmsA: obj.vRmsA / 1000,
+                    vRmsB: obj.vRmsB / 1000,
+                    vRmsC: obj.vRmsC / 1000,
+                    //基波电压幅值
+                    v1A: obj.v1A / 1000,
+                    v1B: obj.v1B / 1000,
+                    v1C: obj.v1C / 1000,
+                    //有功功率
+                    pA: obj.pA / 1000,
+                    pB: obj.pB / 1000,
+                    pC: obj.pC / 1000,
+                    pTot: obj.pTot / 1000,
+                    //无功功率
+                    qA: obj.qA / 1000,
+                    qB: obj.qB / 1000,
+                    qC: obj.qC / 1000,
+                    qTot: obj.qTot / 1000,
+                    //视在功率
+                    sA: obj.sA / 1000,
+                    sB: obj.sB / 1000,
+                    sC: obj.sC / 1000,
+                    sTot: obj.sTot / 1000
+                }
+            }
+            //如果消息返回值是二次值，下拉框是一次值需要单位换算 除以1000 并且乘以pt ct
+            if (obj.dataLevel == 'Secondary' && formInline.dataLevel == 'Primary') {
+                obj = {
+                    ...obj,
+                    // 电压有效值
+                    vRmsA: (obj.vRmsA * obj.pt) / 1000,
+                    vRmsB: (obj.vRmsA * obj.pt) / 1000,
+                    vRmsC: (obj.vRmsA * obj.pt) / 1000,
+                    // 电流有效值
+                    iRmsA: obj.iRmsA * obj.ct,
+                    iRmsB: obj.iRmsA * obj.ct,
+                    iRmsC: obj.iRmsA * obj.ct,
+                    //基波电压幅值
+                    v1A: (obj.v1A * obj.pt) / 1000,
+                    v1B: (obj.v1B * obj.pt) / 1000,
+                    v1C: (obj.v1C * obj.pt) / 1000,
+                    //基波电流幅值
+                    i1A: obj.i1A * obj.ct,
+                    i1B: obj.i1B * obj.ct,
+                    i1C: obj.i1C * obj.ct,
+                    //有功功率
+                    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) / 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) / 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
+            if (obj.dataLevel == 'Primary' && formInline.dataLevel == 'Secondary') {
+                console.log(6666)
+                obj = {
+                    ...obj,
+                    // 电压有效值
+                    vRmsA: (obj.vRmsA / obj.pt) * 1000,
+                    vRmsB: (obj.vRmsA / obj.pt) * 1000,
+                    vRmsC: (obj.vRmsA / obj.pt) * 1000,
+                    // 电流有效值
+                    iRmsA: obj.iRmsA / obj.ct,
+                    iRmsB: obj.iRmsA / obj.ct,
+                    iRmsC: obj.iRmsA / obj.ct,
+                    //基波电压幅值
+                    v1A: (obj.v1A / obj.pt) * 1000,
+                    v1B: (obj.v1B / obj.pt) * 1000,
+                    v1C: (obj.v1C / obj.pt) * 1000,
+                    //基波电流幅值
+                    i1A: obj.i1A / obj.ct,
+                    i1B: obj.i1B / obj.ct,
+                    i1C: obj.i1C / obj.ct,
+                    //有功功率
+                    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) * 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) * 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
+                }
+            }
+            //保留两位小数
+            for (var i in obj) {
+                if (typeof obj[i] == 'number' && obj[i] != 0) {
+                    obj[i] = obj[i].toFixed(2)
+                }
+            }
+            mqttMessage.value = obj
+            realTimeRef.value && realTimeRef.value.setRealData(mqttMessage.value)
+        })
+
+        mqttRef.value.on('error', (error: any) => {
+            console.log('mqtt连接失败...', error)
+            mqttRef.value.end()
+        })
+
+        mqttRef.value.on('close', function () {
+            console.log('mqtt客户端已断开连接.....')
+        })
     }
     //查询暂态事件
     if (dataSet.value.includes('_event')) {
@@ -598,6 +780,13 @@ const handleClick = async (tab?: any) => {
                 }, 1500)
             })
     }
+    if (!dataSet.value.includes('_realtimedata')) {
+        clearInterval(timer.value)
+        clearInterval(realDataTimer.value)
+        if (mqttRef.value) {
+            mqttRef.value.end()
+        }
+    }
 }
 //模版下载
 const handleDownLoadTemplate = () => {}
@@ -663,6 +852,10 @@ const openGroup = () => {
 }
 
 onMounted(() => {})
+onUnmounted(() => {
+    clearInterval(timer.value)
+    clearInterval(realDataTimer.value)
+})
 </script>
 
 <style lang="scss">

src/views/govern/device/control/tabs/realtime.vue

@@ -1,9 +1,10 @@
 <template>
-    <div class="view">
+    <div class="view" v-loading="loading">
+        <div class="view_time" v-if="realData.dataTime">数据时间：{{ realData?.dataTime }}</div>
         <div class="view_top">
             <!-- 左侧仪表盘 -->
             <div class="view_top_left">
-                <div class="left_charts_title">电压有效值</div>
+                <div class="left_charts_title">电压有效值(kV)</div>
                 <div class="left_charts"><MyEchart ref="pieChart1" :options="echartsDataV1"></MyEchart></div>
                 <div class="left_charts"><MyEchart ref="pieChart2" :options="echartsDataV2"></MyEchart></div>
                 <div class="left_charts"><MyEchart ref="pieChart3" :options="echartsDataV3"></MyEchart></div>
@@ -14,13 +15,13 @@
             </div>
             <!-- 右侧仪表盘 -->
             <div class="view_top_right">
-                <div class="right_charts_title">电流有效值</div>
+                <div class="right_charts_title">电流有效值(A)</div>
                 <div class="right_charts"><MyEchart ref="pieChart4" :options="echartsDataA1"></MyEchart></div>
                 <div class="right_charts"><MyEchart ref="pieChart5" :options="echartsDataA2"></MyEchart></div>
                 <div class="right_charts"><MyEchart ref="pieChart6" :options="echartsDataA3"></MyEchart></div>
             </div>
         </div>
-        <div class="view_bot" v-loading="loading">
+        <div class="view_bot" style="display: none">
             <div class="view_bot_tables">
                 <!-- 表格数据 -->
                 <div v-if="tableData.length != 0">
@@ -94,6 +95,126 @@
                 </div>
             </div>
         </div>
+        <div class="view_bot">
+            <vxe-table
+                border
+                height=""
+                :data="realList"
+                :column-config="{ resizable: true, tooltip: true }"
+                :tooltip-config="{ enterable: true }"
+            >
+                <vxe-colgroup align="center" title="电压有效值(kV)">
+                    <vxe-column align="center" field="vRmsA" title="A相"></vxe-column>
+                    <vxe-column align="center" field="vRmsB" title="B相"></vxe-column>
+                    <vxe-column align="center" field="vRmsC" title="C相"></vxe-column>
+                </vxe-colgroup>
+                <vxe-colgroup align="center" title="电流有效值(A)">
+                    <vxe-column align="center" field="iRmsA" title="A相"></vxe-column>
+                    <vxe-column align="center" field="iRmsB" title="B相"></vxe-column>
+                    <vxe-column align="center" field="iRmsC" title="C相"></vxe-column>
+                </vxe-colgroup>
+                <vxe-colgroup align="center" title="基波电压相位(°)">
+                    <vxe-column align="center" field="v1AngA" title="A相"></vxe-column>
+                    <vxe-column align="center" field="v1AngB" title="B相"></vxe-column>
+                    <vxe-column align="center" field="v1AngC" title="C相"></vxe-column>
+                </vxe-colgroup>
+                <vxe-colgroup align="center" title="基波电流相位(°)">
+                    <vxe-column align="center" field="i1AngA" title="A相"></vxe-column>
+                    <vxe-column align="center" field="i1AngB" title="B相"></vxe-column>
+                    <vxe-column align="center" field="i1AngC" title="C相"></vxe-column>
+                </vxe-colgroup>
+            </vxe-table>
+            <br />
+            <vxe-table
+                border
+                height=""
+                :data="realList"
+                :column-config="{ resizable: true, tooltip: true }"
+                :tooltip-config="{ enterable: true }"
+            >
+                <vxe-column align="center" field="freq" width="140" title="频率(Hz)"></vxe-column>
+                <vxe-column align="center" field="freqDev" width="120" title="频率偏差(Hz)"></vxe-column>
+                <vxe-column align="center" width="180" field="vUnbalance" title="电压不平衡度(%)"></vxe-column>
+                <vxe-column align="center" width="180" field="iUnbalance" title="电流不平衡度(%)"></vxe-column>
+                <vxe-colgroup align="center" title="基波电压幅值(kV)">
+                    <vxe-column align="center" field="v1A" title="A相"></vxe-column>
+                    <vxe-column align="center" field="v1B" title="B相"></vxe-column>
+                    <vxe-column align="center" field="v1C" title="C相"></vxe-column>
+                </vxe-colgroup>
+                <vxe-colgroup align="center" title="基波电流幅值(A)">
+                    <vxe-column align="center" field="i1A" title="A相"></vxe-column>
+                    <vxe-column align="center" field="i1B" title="B相"></vxe-column>
+                    <vxe-column align="center" field="i1C" title="C相"></vxe-column>
+                </vxe-colgroup>
+            </vxe-table>
+            <br />
+            <vxe-table
+                border
+                height=""
+                :data="realList"
+                :column-config="{ resizable: true, tooltip: true }"
+                :tooltip-config="{ enterable: true }"
+            >
+                <vxe-colgroup align="center" title="电压偏差(%)">
+                    <vxe-column align="center" field="vDevA" title="A相"></vxe-column>
+                    <vxe-column align="center" field="vDevB" title="B相"></vxe-column>
+                    <vxe-column align="center" field="vDevC" title="C相"></vxe-column>
+                </vxe-colgroup>
+                <vxe-colgroup align="center" title="电压总谐波畸变率(%)">
+                    <vxe-column align="center" field="vThdA" title="A相"></vxe-column>
+                    <vxe-column align="center" field="vThdB" title="B相"></vxe-column>
+                    <vxe-column align="center" field="vThdC" title="C相"></vxe-column>
+                </vxe-colgroup>
+                <vxe-colgroup align="center" title="电流总谐波畸变率(%)">
+                    <vxe-column align="center" field="iThdA" title="A相"></vxe-column>
+                    <vxe-column align="center" field="iThdB" title="B相"></vxe-column>
+                    <vxe-column align="center" field="iThdC" title="C相"></vxe-column>
+                </vxe-colgroup>
+                <vxe-colgroup align="center" title="有功功率(kW)">
+                    <vxe-column align="center" field="pA" title="A相"></vxe-column>
+                    <vxe-column align="center" field="pB" title="B相"></vxe-column>
+                    <vxe-column align="center" field="pC" title="C相"></vxe-column>
+                    <vxe-column align="center" field="pTot" title="总"></vxe-column>
+                </vxe-colgroup>
+            </vxe-table>
+            <br />
+            <vxe-table
+                border
+                height=""
+                :data="realList"
+                :column-config="{ resizable: true, tooltip: true }"
+                :tooltip-config="{ enterable: true }"
+            >
+                <vxe-colgroup align="center" title="无功功率(kVar)">
+                    <vxe-column align="center" field="qA" title="A相"></vxe-column>
+                    <vxe-column align="center" field="qB" title="B相"></vxe-column>
+                    <vxe-column align="center" field="qC" title="C相">
+                        <template #default="{ row }">
+                            {{ row.qC }}
+                        </template>
+                    </vxe-column>
+                    <vxe-column align="center" field="qTot" title="总"></vxe-column>
+                </vxe-colgroup>
+                <vxe-colgroup align="center" title="视在功率(kVA)">
+                    <vxe-column align="center" field="sA" title="A相"></vxe-column>
+                    <vxe-column align="center" field="sB" title="B相"></vxe-column>
+                    <vxe-column align="center" field="sC" title="C相"></vxe-column>
+                    <vxe-column align="center" field="sTot" title="总"></vxe-column>
+                </vxe-colgroup>
+                <vxe-colgroup align="center" title="功率因数">
+                    <vxe-column align="center" field="pfA" title="A相"></vxe-column>
+                    <vxe-column align="center" field="pfB" title="B相"></vxe-column>
+                    <vxe-column align="center" field="pfC" title="C相"></vxe-column>
+                    <vxe-column align="center" field="pfTot" title="总"></vxe-column>
+                </vxe-colgroup>
+                <vxe-colgroup align="center" title="基波功率因数">
+                    <vxe-column align="center" field="dpfA" title="A相"></vxe-column>
+                    <vxe-column align="center" field="dpfB" title="B相"></vxe-column>
+                    <vxe-column align="center" field="dpfC" title="C相"></vxe-column>
+                    <vxe-column align="center" field="dpfTot" title="总"></vxe-column>
+                </vxe-colgroup>
+            </vxe-table>
+        </div>
     </div>
 </template>
 <script lang="ts" setup>
@@ -118,9 +239,8 @@ const echartsDataV3: any = ref({})
 const echartsDataA1: any = ref({})
 const echartsDataA2: any = ref({})
 const echartsDataA3: any = ref({})
-//渲染中相角图
+//渲染中间相角图
 const initRadioCharts = () => {
-    //中间指针图
     echartsData1.value = {
         options: {
             grid: {
@@ -351,6 +471,17 @@ const initRadioCharts = () => {
             }
         })
     })
+
+    //新的实时数据
+    // 电流相角
+    echartsData1.value.options.series[0].data[0].value = realData.value.i1AngA || 0
+    echartsData1.value.options.series[0].data[1].value = realData.value.i1AngB || 0
+    echartsData1.value.options.series[0].data[2].value = realData.value.i1AngC || 0
+    // 电压相角
+    echartsData1.value.options.series[1].data[0].value = realData.value.v1AngA || 0
+    echartsData1.value.options.series[1].data[1].value = realData.value.v1AngB || 0
+    echartsData1.value.options.series[1].data[2].value = realData.value.v1AngC || 0
+
     for (var i = 0; i < echartsData1.value.options.series.length; i++) {
         echartsData1.value.options.series[i].type = 'gauge'
         echartsData1.value.options.series[i].startAngle = 90
@@ -413,9 +544,12 @@ const init = () => {
             ]
         }
     }
-    echartsDataV1.value = echartsData.value
+    echartsDataV1.value = JSON.parse(JSON.stringify(echartsData.value))
-    echartsDataV2.value = echartsData.value
+    echartsDataV2.value = JSON.parse(JSON.stringify(echartsData.value))
-    echartsDataV3.value = echartsData.value
+    echartsDataV3.value = JSON.parse(JSON.stringify(echartsData.value))
+    echartsDataV1.value.options.series[0].max = 12
+    echartsDataV2.value.options.series[0].max = 12
+    echartsDataV3.value.options.series[0].max = 12
     echartsDataA1.value = echartsData.value
     echartsDataA2.value = echartsData.value
     echartsDataA3.value = echartsData.value
@@ -431,6 +565,7 @@ const columnsData: any = ref([])
 const getColumns = () => {
     getRealTimeTableList().then(res => {
         columnsData.value = res.data
+        console.log(dataList.value, '+++++++++++++++++++++++++446')
         getTableData(dataList.value)
     })
 }
@@ -438,6 +573,7 @@ const getColumns = () => {
 const columnsDataTop: any = ref([])
 const columnsDataBot: any = ref([])
 const getTableData = (list: any) => {
+    console.log(list, '+++++++++++')
     loading.value = true
     tableData.value = list
     columnsDataTop.value = []
@@ -460,103 +596,64 @@ const getTableData = (list: any) => {
     })
 }
 //电流相角数组&电压相角数组
-const iRadioList: any = ref([]),
+const iRadioList: any = ref([])
-    vRadioList: any = ref([])
+const vRadioList: any = ref([])
-//获取实时数据
+
-const getRealTimeData = async (val: any) => {
+const realData = ref<any>({})
-    iRadioList.value = []
+const realList = ref<any>([])
-    vRadioList.value = []
+console.log(realData.value, '++++++++++++++++++++++757')
-    val.map((item: any) => {
+const setRealData = (val: any) => {
-        //基波电流相角
+    console.log(val, '实时数据')
-        if (item.statisticalName == 'Pq_FundIAng') {
+    realData.value = val
-            iRadioList.value.push(item)
+    realList.value = [val]
-        }
-        //相电压基波有效值相角
-        if (item.statisticalName == 'Pq_FundUAng') {
-            vRadioList.value.push(item)
-        }
-    })
     initRadioCharts()
-    loading.value = true
+    //新的
-    if (val.length != 0) {
+    console.log(realData.value, '--99--88--77')
-        dataList.value = val
+    echartsDataV1.value.options.series[0].data = [
-        await getColumns()
+        {
-
+            name: 'A相',
-        dataList.value.map((item: any, index: any) => {
+            value: realData.value.vRmsA || 0
-            if (item.anotherName == '相电压总有效值') {
+        }
-                listV.value.push(item)
+    ]
-            }
+    pieChart1.value.initChart()
-            if (item.anotherName == '线电压总有效值') {
+    echartsDataV2.value.options.series[0].data = [
-                listA.value.push(item)
+        {
-            }
+            name: 'B相',
-        })
+            value: realData.value.vRmsB || 0
-        console.log(listA.value, listV.value, '++++++++++++494')
+        }
-        echartsDataV1.value.options.series[0].data = [
+    ]
-            {
+    pieChart2.value.initChart()
-                name: 'A相',
+    echartsDataV3.value.options.series[0].data = [
-                value:
+        {
-                    listV.value.find((item: any) => {
+            name: 'C相',
-                        return item.phase == 'A'
+            value: realData.value.vRmsC || 0
-                    })?.statisticalData || 0
+        }
-            }
+    ]
-        ]
+    pieChart3.value.initChart()
-        pieChart1.value.initChart()
+    //新的电流有效值
-
+    echartsDataA1.value.options.series[0].data = [
-        echartsDataV2.value.options.series[0].data = [
+        {
-            {
+            name: 'A相',
-                name: 'B相',
+            value: realData.value.iRmsA || 0
-                value:
+        }
-                    listV.value.find((item: any) => {
+    ]
-                        return item.phase == 'B'
+    pieChart4.value.initChart()
-                    })?.statisticalData || 0
+    echartsDataA2.value.options.series[0].data = [
-            }
+        {
-        ]
+            name: 'B相',
-        pieChart2.value.initChart()
+            value: realData.value.iRmsB || 0
-        echartsDataV3.value.options.series[0].data = [
+        }
-            {
+    ]
-                name: 'C相',
+    pieChart5.value.initChart()
-                value:
+    echartsDataA3.value.options.series[0].data = [
-                    listV.value.find((item: any) => {
+        {
-                        return item.phase == 'C'
+            name: 'C相',
-                    })?.statisticalData || 0
+            value: realData.value.iRmsC || 0
-            }
+        }
-        ]
+    ]
-        pieChart3.value.initChart()
+    pieChart6.value.initChart()
-        echartsDataA1.value.options.series[0].data = [
-            {
-                name: 'AB相',
-                value:
-                    listA.value.find((item: any) => {
-                        return item.phase == 'AB'
-                    })?.statisticalData || 0
-            }
-        ]
-        pieChart4.value.initChart()
-        echartsDataA2.value.options.series[0].data = [
-            {
-                name: 'BC相',
-                value:
-                    listA.value.find((item: any) => {
-                        return item.phase == 'BC'
-                    })?.statisticalData || 0
-            }
-        ]
-        pieChart5.value.initChart()
-        echartsDataA3.value.options.series[0].data = [
-            {
-                name: 'CA相',
-                value:
-                    listA.value.find((item: any) => {
-                        return item.phase == 'CA'
-                    })?.statisticalData || 0
-            }
-        ]
-        pieChart6.value.initChart()
-    } else {
-        init()
-    }
 }
-defineExpose({ getRealTimeData })
+defineExpose({ setRealData })
 onMounted(() => {
     init()
     initRadioCharts()