b

childPackage/pages/electricQuery/index.js

@@ -142,14 +142,14 @@ Page({
       const times = [...new Set(data?.map(item => item.time))].
       map(item => Number(item.replace(point, ""))).
       sort((a, b) => a - b).
-      map(ele => `${ele}${point}`.padStart(2, "0"));
- 
+      map(ele => `${ele}${point}`.padStart(3, "0"));
+      console.log(times)
       const options  = {
         tooltip: {
           trigger: 'axis'
         },
         legend: {
-          data: parkInfo?.category === 1 ? ["尖", "峰", "平", "谷"] : data?.map(item => item?.meter?.address),
+          data:  data?.map(item => item?.meter?.address),
         },
         grid: {
           left: '3%',
@@ -165,34 +165,13 @@ Page({
         yAxis: {
           type: 'value'
         },
-        series: parkInfo?.category === 1 ? [
-          {
-            name: "尖",
-            type: 'line',
-            data: data?.map(item => Number(item?.critical || 0))
-          },
-          {
-            name: "峰",
-            type: 'line',
-            data: data?.map(item => Number(item?.peak || 0))
-          },
-          {
-            name: "平",
-            type: 'line',
-            data: data?.map(item => Number(item?.flat || 0))
-          },
-          {
-            name: "谷",
-            type: 'line',
-            data: data?.map(item => Number(item?.valley || 0))
-          }
-        ] : ids?.map(item => {
+        series: ids?.map(item => {
           const element = data?.find(i => i?.meter?.id === item)
           const list = data?.filter(ele => ele?.meter?.id === item)
           const newList = [...times].map(item => {
             const exist = list.find(ele => ele.time === item)
             if (exist) {
-              return exist.number;
+              return Number(exist.critical)+ Number(exist.peak)+Number(exist.flat)+Number(exist.valley);
             }
             return null
           })