修改bug

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

@@ -239,4 +239,7 @@ defineExpose({ open })
     display: flex;
     flex-direction: column;
 }
+.el-form--inline .el-form-item {
+    margin-bottom: 10px !important;
+}
 </style>

src/views/govern/device/control/tabs/components/realtrend.vue

@@ -285,15 +285,15 @@ const init = () => {
                 left: '3%',
                 right: '5%'
             },
-            tooltip: {
-                trigger: 'axis',
-                axisPointer: {
-                    type: 'cross',
-                    label: {
-                        show: false
-                    }
-                }
-            },
+            // tooltip: {
+            //     trigger: 'axis',
+            //     axisPointer: {
+            //         type: 'cross',
+            //         label: {
+            //             show: false
+            //         }
+            //     }
+            // },
             legend: {
                 data: [],
                 itemGap: 15,
@@ -359,7 +359,7 @@ const init = () => {
             list.push({ phase: item.phase, title: item.title, list: item.phaseList })
         }
     })
-    const colorList = ['#00CC99', '#FF9900', '#1DD0CE', 'cadetblue']
+    const colorList = ['#0e8780', '#FFCC00', '#009900', '#CC0000', ]
     list.map((item: any, index: any) => {
         echartsData.value.options.legend.data.push(item.title)
         echartsData.value.options.series.push({

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

@@ -313,21 +313,21 @@ const initRadioCharts = () => {
                             value: 160,
                             name: 'A相',
                             itemStyle: {
-                                color: '#A5292A'
+                                color: '#FFCC00'
                             }
                         },
                         {
                             value: 70,
                             name: 'B相',
                             itemStyle: {
-                                color: '#DAA521'
+                                color: '#009900'
                             }
                         },
                         {
                             value: 40,
                             name: 'C相',
                             itemStyle: {
-                                color: '#2F8A57'
+                                color: '#CC0000'
                             }
                         }
                     ]
@@ -431,6 +431,7 @@ const columnsData: any = ref([])
 const getColumns = () => {
     getRealTimeTableList().then(res => {
         columnsData.value = res.data
+        getTableData(dataList.value)
     })
 }
 //处理表格数据
@@ -441,6 +442,8 @@ const getTableData = (list: any) => {
     tableData.value = list
     columnsDataTop.value = []
     columnsDataBot.value = []
+    console.log('🚀 ~ columnsData.value.map ~ columnsData.value:', columnsData.value)
+
     columnsData.value.map((item: any, index: any) => {
         item.map((vv: any) => {
             vv.statisticalData = list.find((kk: any) => {
@@ -448,7 +451,7 @@ const getTableData = (list: any) => {
             })?.statisticalData
         })
         if (index < 4) {
-            columnsDataTop.value.push(item) 
+            columnsDataTop.value.push(item)
         }
         if (index >= 4) {
             columnsDataBot.value.push(item)
@@ -460,7 +463,7 @@ const getTableData = (list: any) => {
 const iRadioList: any = ref([]),
     vRadioList: any = ref([])
 //获取实时数据
-const getRealTimeData = (val: any) => {
+const getRealTimeData = async (val: any) => {
     iRadioList.value = []
     vRadioList.value = []
     val.map((item: any) => {
@@ -476,9 +479,9 @@ const getRealTimeData = (val: any) => {
     initRadioCharts()
     loading.value = true
     if (val.length != 0) {
-        getColumns()
-        getTableData(val)
         dataList.value = val
+        await getColumns()
+
         dataList.value.map((item: any, index: any) => {
             if (item.anotherName == '相电压总有效值') {
                 listV.value.push(item)
@@ -490,73 +493,62 @@ const getRealTimeData = (val: any) => {
 
         echartsDataV1.value.options.series[0].data = [
             {
-                name:
+                name: 'A相',
+                value:
                     listV.value.find((item: any) => {
                         return item.phase == 'A'
-                    })?.phase + '相',
-                value: listV.value.find((item: any) => {
-                    return item.phase == 'A'
-                })?.statisticalData
+                    })?.statisticalData || 0
             }
         ]
         pieChart1.value.initChart()
+
         echartsDataV2.value.options.series[0].data = [
             {
-                name:
+                name: 'B相',
+                value:
                     listV.value.find((item: any) => {
                         return item.phase == 'B'
-                    })?.phase + '相',
-                value: listV.value.find((item: any) => {
-                    return item.phase == 'B'
-                })?.statisticalData
+                    })?.statisticalData || 0
             }
         ]
         pieChart2.value.initChart()
         echartsDataV3.value.options.series[0].data = [
             {
-                name:
+                name: 'C相',
+                value:
                     listV.value.find((item: any) => {
                         return item.phase == 'C'
-                    })?.phase + '相',
-                value: listV.value.find((item: any) => {
-                    return item.phase == 'C'
-                })?.statisticalData
+                    })?.statisticalData || 0
             }
         ]
         pieChart3.value.initChart()
         echartsDataA1.value.options.series[0].data = [
             {
-                name:
+                name: 'AB相',
+                value:
                     listA.value.find((item: any) => {
                         return item.phase == 'AB'
-                    })?.phase + '相',
-                value: listA.value.find((item: any) => {
-                    return item.phase == 'AB'
-                })?.statisticalData
+                    })?.statisticalData || 0
             }
         ]
         pieChart4.value.initChart()
         echartsDataA2.value.options.series[0].data = [
             {
-                name:
+                name: 'BC相',
+                value:
                     listA.value.find((item: any) => {
                         return item.phase == 'BC'
-                    })?.phase + '相',
-                value: listA.value.find((item: any) => {
-                    return item.phase == 'BC'
-                })?.statisticalData
+                    })?.statisticalData || 0
             }
         ]
         pieChart5.value.initChart()
         echartsDataA3.value.options.series[0].data = [
             {
-                name:
+                name: 'CA相',
+                value:
                     listA.value.find((item: any) => {
                         return item.phase == 'CA'
-                    })?.phase + '相',
-                value: listA.value.find((item: any) => {
-                    return item.phase == 'CA'
-                })?.statisticalData
+                    })?.statisticalData || 0
             }
         ]
         pieChart6.value.initChart()