diff --git a/childPackage/pages/billDetail/index.wxml b/childPackage/pages/billDetail/index.wxml
index 898360d..26cc9d4 100644
--- a/childPackage/pages/billDetail/index.wxml
+++ b/childPackage/pages/billDetail/index.wxml
@@ -190,196 +190,6 @@
-
-
\ No newline at end of file
diff --git a/childPackage/pages/electricQuery/index.js b/childPackage/pages/electricQuery/index.js
index 7f32ce0..edf1664 100644
--- a/childPackage/pages/electricQuery/index.js
+++ b/childPackage/pages/electricQuery/index.js
@@ -1,6 +1,7 @@
// pages/electricQuery/index.js
import { exportElectricityList, getAccountingList, getElectricityList, getMeterReadingList } from "../../../service/accounting";
import { getTenementMeterList } from "../../../service/meter";
+import { getParkInfoByTime } from "../../../service/park";
import dayjs from "../../../utils/dayjs";
import request from '../../../utils/request';
import * as echarts from '../../components/echarts/echarts';
@@ -29,11 +30,18 @@ Page({
header: [
- { key: 'address', title: '电表地址', renderBody: (item) => item.meter?.address },
+ // { key: 'address', title: '电表地址', renderBody: (item) => item.meter?.address },
{ title: '时间',renderBody: (item) => { return item.time } },
{ key: 'number', title: '耗量' },
],
-
+ 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: '谷' },
+ ],
list: [],
visible: false,
@@ -76,7 +84,7 @@ Page({
},
changeTimeType(e) {
- const { type } = e.currentTarget.dataset
+ const { type } = e.currentTarget.dataset;
const that = this;
this.setData({ timeType: type }, () => {
loadingFunc(async () => {
@@ -235,15 +243,39 @@ Page({
alertInfo(message)
return;
}
-
+ const first = data?.[0]
this.setData({
meterList: data || [],
+ meterId: first?.id,
+ meterAddress: first?.address,
+ meterCode: first?.code,
+ }, () => {
+ const { queryType, } = this.data;
+ switch(queryType) {
+ case 1:
+ loadingFunc(async () => {
+ await this.getReadingList();
+ })
+ break;
+ case 2:
+ loadingFunc(async () => {
+ await this.getAccountingBalanceList();
+ })
+ break;
+ default:
+ loadingFunc(async () => {
+ await this.init();
+ })
+ break;
+ }
})
},
clickMeter() {
this.setData({
type: "meter",
- columns: [{ id: "", name: "全部", code: "" }, ...this.data.meterList.map(item => ({ id: item.id, name: `${item.code}-${item.address}`, code: item.code }))],
+ columns: [
+ // { id: "", name: "全部", code: "" },
+ ...this.data.meterList.map(item => ({ id: item.id, name: `${item.code}-${item.address}`, code: item.code }))],
show: true,
title: "表计"
})
@@ -257,11 +289,12 @@ Page({
})
},
onOk(e) {
- const { id, code } = e.detail.value;
+ const { id, code, address } = e.detail.value;
this.setData({
// year: currentYear,
meterId: id,
meterCode: code,
+ meterAddress: address,
type: "",
show: false,
title: ""
@@ -339,8 +372,31 @@ Page({
*/
onShow() {
this.getMeters()
+ this.getParkInfo()
+ },
+ async getParkInfo() {
+ const park = wx.getStorageSync('park');
+ const { timeType, yearMonthDay, yearMonth, year } = this.data;
+ let time = ''
+ switch(timeType) {
+ case 0:
+ time = yearMonthDay;
+ break;
+ case 1:
+ time = yearMonth;
+ break;
+ case 2:
+ time = year;
+ }
+ const { data, code, message } = await getParkInfoByTime(park?.id, `${time}`, `${timeType}`,)
+ if (code !== OK) {
+ alertInfo(message)
+ return;
+ }
+ this.setData({
+ parkInfo: data
+ })
},
-
/**
* 生命周期函数--监听页面隐藏
*/
diff --git a/childPackage/pages/electricQuery/index.wxml b/childPackage/pages/electricQuery/index.wxml
index 9190d29..ba275fe 100644
--- a/childPackage/pages/electricQuery/index.wxml
+++ b/childPackage/pages/electricQuery/index.wxml
@@ -7,7 +7,7 @@
- {{ meterCode === "" ? '全部' : meterCode }}
+ {{ meterAddress === "" ? '-' : meterAddress }}
@@ -81,7 +81,12 @@
-->
-
+
合计：表计数量：{{meterNumber}}，耗电量：{{electricNumber}}
diff --git a/service/park.js b/service/park.js
index a4b8090..633f289 100644
--- a/service/park.js
+++ b/service/park.js
@@ -15,4 +15,9 @@ export const getLoginParkList = async function({ keyword }) {
// 获取建筑列表
export const getParkBuildingList = async function(pid) {
return await GET(`/vx/park/${pid}/building`);
+}
+
+// 获取指定园区指定月份核算的详细信息
+export const getParkInfoByTime = async function(pid, period, method) {
+ return await GET(`/park/getReportParkIndex/${pid}?period=${period}&method=${method}`);
}
\ No newline at end of file
diff --git a/utils/index.js b/utils/index.js
index 63a9360..51e01f4 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -45,10 +45,10 @@ export function getConfigByEnv() {
switch (envVersion) {
// 开发版
case 'develop':
- // api = "http://localhost:8000"
+ api = "http://localhost:8000"
// api = "https://zgd.hbhcbn.com/api3"
// api = "https://zgd.hbhcbn.com/api3"
- api = "https://zgd.hbhcbn.com/wxApi"
+ // api = "https://zgd.hbhcbn.com/wxApi"
// api = "http://127.0.0.1:4523/m1/4143821-0-default"
break;
// 体验版
@@ -198,9 +198,11 @@ export const wxLogin = () => {
resolve(res.code)
return
}
+ alertInfo("未进行微信登录")
reject()
},
fail: err => {
+ alertError(err)
reject(err)
}
})