用电查询支持尖峰平谷

childPackage/pages/electricQuery/components/reading/index.js

@@ -12,6 +12,7 @@ Component({
    */
   properties: {
     meter: String,
+    ParkInfo: Object,
   },
   observers: {
     'meter': function() {

childPackage/pages/electricQuery/components/reading/index.wxml

@@ -66,6 +66,36 @@
         border="{{ false }}"
         label="表字"
         readonly
+        wx:if="{{parkInfo.category !== 1}}"
+      />
+     
+      <van-field
+        value="{{ readingDetail.critical }}"
+        border="{{ false }}"
+        label="表字（尖）"
+        readonly
+        wx:if="{{parkInfo.category === 1}}"
+      />
+      <van-field
+        value="{{ readingDetail.peak }}"
+        border="{{ false }}"
+        label="表字（峰）"
+        readonly
+        wx:if="{{parkInfo.category === 1}}"
+      />
+      <van-field
+        value="{{ readingDetail.flat }}"
+        border="{{ false }}"
+        label="表字（平）"
+        readonly
+        wx:if="{{parkInfo.category === 1}}"
+      />
+      <van-field
+        value="{{ readingDetail.valley }}"
+        border="{{ false }}"
+        label="表字（谷）"
+        readonly
+        wx:if="{{parkInfo.category === 1}}"
       />
     </van-cell-group>
   </view>

childPackage/pages/electricQuery/index.js

@@ -37,14 +37,13 @@ Page({
     valleyHeader: [
       // { key: 'address', title: '电表地址', renderBody: (item) => item.meter?.address },
       { title: '时间',renderBody: (item) => { return item.time } },
-      { key: 'number', title: '尖' },
-      { key: 'number', title: '峰' },
-      { key: 'number', title: '平' },
-      { key: 'number', title: '谷' },
+      { key: 'critical', title: '尖' },
+      { key: 'peak', title: '峰' },
+      { key: 'flat', title: '平' },
+      { key: 'valley', title: '谷' },
     ],
     list: [],
     visible: false,
-  
     accountingList: [],
     electricNumber: 0,
     meterNumber: 0,
@@ -98,11 +97,13 @@ Page({
    */
   onLoad(options) {
     loadingFunc(async () => {
+      await this.getMeters()
+      await this.getParkInfo()
       await this.init()
     })
   },
   async init() {
-    const { queryType, timeType, meterId, year, yearMonth, yearMonthDay, page } = this.data;
+    const { queryType, timeType, meterId, year, yearMonth, yearMonthDay, page, parkInfo } = this.data;
     let time;
     switch(timeType) {
       case 1:
@@ -148,7 +149,7 @@ Page({
           trigger: 'axis'
         },
         legend: {
-          data: data?.map(item => item?.meter?.address),
+          data: parkInfo?.category === 1 ? ["尖", "峰", "平", "谷"] : data?.map(item => item?.meter?.address),
         },
         grid: {
           left: '3%',
@@ -164,7 +165,28 @@ Page({
         yAxis: {
           type: 'value'
         },
-        series: ids?.map(item => {
+        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 => {
           const element = data?.find(i => i?.meter?.id === item)
           const list = data?.filter(ele => ele?.meter?.id === item)
           const newList = [...times].map(item => {
@@ -371,8 +393,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-    this.getMeters()
-    this.getParkInfo()
+
   },
   async getParkInfo() {
     const park = wx.getStorageSync('park');
@@ -393,9 +414,17 @@ Page({
       alertInfo(message)
       return;
     }
-    this.setData({
-      parkInfo: data
+    const that = this;
+    return new Promise((resolve) => {
+     
+      that.setData({
+        parkInfo: data
+      }, () => {
+        resolve()
+      })
     })
+
+    
   },
   /**
    * 生命周期函数--监听页面隐藏

childPackage/pages/electricQuery/index.wxml

@@ -85,7 +85,13 @@
         list="{{list}}" 
         header="{{header}}" 
         totalPage="{{totalPage}}" 
-
+        wx:if="{{parkInfo.category !== 1}}"
+      />
+      <listTable 
+        list="{{list}}" 
+        header="{{valleyHeader}}" 
+        totalPage="{{totalPage}}" 
+        wx:if="{{parkInfo.category === 1}}"
       />
     </view>
     <view class="sum">
@@ -93,7 +99,7 @@
     </view>
   </view>
   <view wx:if="{{queryType === 1}}">
-    <reading meter="{{meterId}}" />
+    <reading meter="{{meterId}}" parkInfo="{{parkInfo}}" />
   </view>
   <view wx:if="{{queryType === 2}}">
     <view style="margin: 30rpx;">