修改用电查询
This commit is contained in:
parent
028d695deb
commit
4d665588ac
@ -190,196 +190,6 @@
|
||||
</van-row>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view style="font-size: 30rpx;font-weight: 600;"> 尖 </view> -->
|
||||
<!-- <view style="margin: 20rpx 0; background-color: #fff;">
|
||||
<van-row custom-style="height: 100%;display: flex;flex-direction: column;overflow: hidden;">
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 电表地址 </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 起码 </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 止码 </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 电度电量 </view>
|
||||
</van-col>
|
||||
</van-row>
|
||||
<view class="top">
|
||||
<view class="meterListItem" wx:for="{{meters}}" wx:key="id">
|
||||
<van-row>
|
||||
<van-col span="6">
|
||||
<view class="tableContent"> {{item.address}} </view>
|
||||
</van-col>
|
||||
|
||||
<van-col span="6">
|
||||
<view class="tableContent"> {{item.startSharp}} </view>
|
||||
</van-col>
|
||||
|
||||
<van-col span="6">
|
||||
<view class="tableContent"> {{item.endSharp}} </view>
|
||||
</van-col>
|
||||
|
||||
<van-col span="6">
|
||||
<view class="tableContent"> {{item.critical.amount}} </view>
|
||||
</van-col>
|
||||
</van-row>
|
||||
</view>
|
||||
</view>
|
||||
<van-row>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 线损电量 </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 公摊电量 </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 合计电量 </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 合计电费 </view>
|
||||
</van-col>
|
||||
</van-row>
|
||||
<view class="bottom">
|
||||
<view class="meterListItem" wx:for="{{meters}}" wx:key="id">
|
||||
<van-row>
|
||||
<van-col span="6">
|
||||
<view class="tableContent"> {{item.lossSharp}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableContent"> {{item.poolSharp}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableContent"> {{item.finalSharp}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableContent"> {{item.chargeSharp}} </view>
|
||||
</van-col>
|
||||
</van-row>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view style="font-size: 30rpx;font-weight: 600;"> 峰 </view>
|
||||
<view style="margin: 20rpx 0; background-color: #fff;">
|
||||
<van-row custom-style="height: 100%;display: flex;flex-direction: column;overflow: hidden;">
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 电表地址 </view>
|
||||
<view class="tableContent"> {{item.address}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 起码 </view>
|
||||
<view class="tableContent"> {{item.startPeak}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 止码 </view>
|
||||
<view class="tableContent"> {{item.endPeak}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 电度电量 </view>
|
||||
<view class="tableContent"> {{item.peak.amount}} </view>
|
||||
</van-col>
|
||||
</van-row>
|
||||
<van-row>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 线损电量 </view>
|
||||
<view class="tableContent"> {{item.lossPeak}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 公摊电量 </view>
|
||||
<view class="tableContent"> {{item.poolPeak}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 合计电量 </view>
|
||||
<view class="tableContent"> {{item.finalPeak}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 合计电费 </view>
|
||||
<view class="tableContent"> {{item.chargePeak}} </view>
|
||||
</van-col>
|
||||
</van-row>
|
||||
</view>
|
||||
<view style="font-size: 30rpx;font-weight: 600;"> 平 </view>
|
||||
<view style="margin: 20rpx 0; background-color: #fff;">
|
||||
<van-row custom-style="height: 100%;display: flex;flex-direction: column;overflow: hidden;">
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 电表地址 </view>
|
||||
<view class="tableContent"> {{item.address}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 起码 </view>
|
||||
<view class="tableContent"> {{item.startFlat}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 止码 </view>
|
||||
<view class="tableContent"> {{item.endFlat}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 电度电量 </view>
|
||||
<view class="tableContent"> {{item.flat.amount}} </view>
|
||||
</van-col>
|
||||
|
||||
</van-row>
|
||||
<van-row>
|
||||
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 线损电量 </view>
|
||||
<view class="tableContent"> {{item.lossFlat}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 公摊电量 </view>
|
||||
<view class="tableContent"> {{item.poolFlat}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 合计电量 </view>
|
||||
<view class="tableContent"> {{item.finalFlat}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 合计电费 </view>
|
||||
<view class="tableContent"> {{item.chargeFlat}} </view>
|
||||
</van-col>
|
||||
</van-row>
|
||||
</view>
|
||||
<view style="font-size: 30rpx;font-weight: 600;"> 谷 </view>
|
||||
<view style="margin: 20rpx 0; background-color: #fff;">
|
||||
<van-row custom-style="height: 100%;display: flex;flex-direction: column;overflow: hidden;">
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 电表地址 </view>
|
||||
<view class="tableContent"> {{item.address}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 起码 </view>
|
||||
<view class="tableContent"> {{item.startValley}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 止码 </view>
|
||||
<view class="tableContent"> {{item.endValley}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 电度电量 </view>
|
||||
<view class="tableContent"> {{item.valley.amount}} </view>
|
||||
</van-col>
|
||||
</van-row>
|
||||
<van-row>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 线损电量 </view>
|
||||
<view class="tableContent"> {{item.lossValley}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 公摊电量 </view>
|
||||
<view class="tableContent"> {{item.poolValley}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 合计电量 </view>
|
||||
<view class="tableContent"> {{item.finalValley}} </view>
|
||||
</van-col>
|
||||
<van-col span="6">
|
||||
<view class="tableTitle"> 合计电费 </view>
|
||||
<view class="tableContent"> {{item.chargeValley}} </view>
|
||||
</van-col>
|
||||
</van-row>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
<view style="height: 20rpx;"></view>
|
||||
@ -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
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面隐藏
|
||||
*/
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
</view>
|
||||
<view class="select" bind:tap="clickMeter">
|
||||
<view class="selectContent">
|
||||
{{ meterCode === "" ? '全部' : meterCode }}
|
||||
{{ meterAddress === "" ? '-' : meterAddress }}
|
||||
</view>
|
||||
<van-icon name="arrow-down" />
|
||||
</view>
|
||||
@ -81,7 +81,12 @@
|
||||
</view>
|
||||
<empty bind:refresh="init" wx:else /> -->
|
||||
|
||||
<listTable list="{{list}}" header="{{header}}" totalPage="{{totalPage}}" />
|
||||
<listTable
|
||||
list="{{list}}"
|
||||
header="{{header}}"
|
||||
totalPage="{{totalPage}}"
|
||||
|
||||
/>
|
||||
</view>
|
||||
<view class="sum">
|
||||
合计：表计数量：{{meterNumber}}，耗电量：{{electricNumber}}
|
||||
|
||||
@ -16,3 +16,8 @@ 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}`);
|
||||
}
|
||||
@ -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)
|
||||
}
|
||||
})
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user