From 430809639412648eb324be95c9e924c5037fd61b Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Wed, 17 Sep 2025 14:51:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E8=81=94=E8=B0=83=E6=8A=84?= =?UTF-8?q?=E8=A1=A8=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/editModal/index.js | 22 ++++++++++-- .../components/editModal/index.wxml | 2 ++ .../components/meterInfo/index.wxss | 4 +++ pages/readingHistory/index.js | 34 ++++++++++++++++--- pages/readingHistory/index.wxml | 15 ++++++-- pages/workBench/index.js | 2 +- .../components/readingInfo/index.js | 2 +- service/workBench.js | 6 ++++ 8 files changed, 74 insertions(+), 13 deletions(-) diff --git a/pages/readingHistory/components/editModal/index.js b/pages/readingHistory/components/editModal/index.js index f066012..b8ab777 100644 --- a/pages/readingHistory/components/editModal/index.js +++ b/pages/readingHistory/components/editModal/index.js @@ -1,6 +1,6 @@ // pages/workBench/components/tenement/components/bindMeter/index.js // 0015980101 -import { bindMeter, } from "../../../../service/tenement" +import { createReading } from "../../../../service/workBench" import { getWorkMeterDetail } from "../../../../service/meter" import { alertInfo, alertSuccess } from "../../../../utils/index"; import request from "../../../../utils/request" @@ -16,7 +16,9 @@ Component({ title: String, timeProps: String, numberProps: String, - id: String + id: String, + meter: String, + park: String }, observers: { "timeProps": function(newValue) { @@ -63,10 +65,24 @@ Component({ }) }, async onSubmit() { - const { time, number } = this.data; + const { time, number, id, park, meter } = this.data; if (time == null || number == null) { alertInfo("请正确填写后保存") return; + } + if (!id) { + const { code, message } = await createReading(park, meter, { + overall: `${number}`, + flat: `${number}`, + readAt: time + }) + if (code !== OK) { + alertError(message) + return + } + alertSuccess("录入成功") + } else { + } this.triggerEvent("ok") }, diff --git a/pages/readingHistory/components/editModal/index.wxml b/pages/readingHistory/components/editModal/index.wxml index 12356ca..e699846 100644 --- a/pages/readingHistory/components/editModal/index.wxml +++ b/pages/readingHistory/components/editModal/index.wxml @@ -25,6 +25,8 @@ value="{{ number }}" placeholder="请输入读数" label="读数" + bind:change="onChange" + data-name="number" type="digit" border="{{ false }}" title-width="100rpx" diff --git a/pages/readingHistory/components/meterInfo/index.wxss b/pages/readingHistory/components/meterInfo/index.wxss index c257812..b7f616d 100644 --- a/pages/readingHistory/components/meterInfo/index.wxss +++ b/pages/readingHistory/components/meterInfo/index.wxss @@ -19,4 +19,8 @@ justify-content: space-between; font-size: 30rpx; margin-bottom: 20rpx; +} + +.status { + font-size: 30rpx; } \ No newline at end of file diff --git a/pages/readingHistory/index.js b/pages/readingHistory/index.js index 792222d..a0cc352 100644 --- a/pages/readingHistory/index.js +++ b/pages/readingHistory/index.js @@ -1,7 +1,7 @@ // pages/readingHistory/index.js -import { getMeterReadingRouteMeterDetail } from "../../service/workBench" +import { getMeterReadingRouteMeterDetail, getReadingList } from "../../service/workBench" import request from "../../utils/request" -import { alertInfo, alertSuccess, alertError } from "../../utils/index" +import { alertInfo, alertSuccess, alertError, loadingFunc } from "../../utils/index" const { OK } = request; Page({ @@ -9,7 +9,9 @@ Page({ * 页面的初始数据 */ data: { - list: [{time: "2025-05-05 14:10:09", number: 90803.87}] + list: [], + page: 1, + size: 20, }, /** @@ -17,12 +19,21 @@ Page({ */ onLoad(options) { const { meter, park } = options; + const that = this; this.setData({ meter, park + }, () => { + that.refresh(); }) this.getMeterInfo(meter); }, + refresh() { + const that = this; + loadingFunc(async () => { + await that.getList(); + }) + }, async getMeterInfo(id) { const { code, message, data } = await getMeterReadingRouteMeterDetail(id) if (code !== OK) { @@ -31,6 +42,17 @@ Page({ } this.setData({ meterInfo: data }) }, + async getList() { + const { meter, park, page } = this.data; + const { code, message, records: data } = await getReadingList(park, meter, page) + if (code !== OK) { + alertError(message) + return; + } + this.setData({ + list: data + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ @@ -40,7 +62,8 @@ Page({ handleCreate() { this.setData({ title: "新增记录", - visible: true + visible: true, + type: "create" }) }, handleUpdate() { @@ -49,7 +72,8 @@ Page({ visible: true, time: "2025-09-11", number: 100, - id: "" + id: "", + type: "edit", }) }, handleDelete(e) { diff --git a/pages/readingHistory/index.wxml b/pages/readingHistory/index.wxml index 664201d..a48b788 100644 --- a/pages/readingHistory/index.wxml +++ b/pages/readingHistory/index.wxml @@ -22,10 +22,10 @@ - {{ item.time }} + {{ item.readAt }} - {{ item.number }} + {{ item.overall }} @@ -46,4 +46,13 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/pages/workBench/index.js b/pages/workBench/index.js index 0480db6..2b08c44 100644 --- a/pages/workBench/index.js +++ b/pages/workBench/index.js @@ -5,7 +5,7 @@ Page({ * 页面的初始数据 */ data: { - active: 4 + active: 1 }, /** diff --git a/pages/writeReading/components/readingInfo/index.js b/pages/writeReading/components/readingInfo/index.js index 5271828..b7f5813 100644 --- a/pages/writeReading/components/readingInfo/index.js +++ b/pages/writeReading/components/readingInfo/index.js @@ -30,7 +30,7 @@ Component({ jumpToHistory() { const { meterInfo } = this.data; wx.navigateTo({ - url: `/pages/readingHistory/index?meter=${meterInfo?.id}&park=${meterInfo?.park}`, + url: `/pages/readingHistory/index?meter=${meterInfo?.id}&park=${meterInfo?.parkId}`, }) }, handlePrev() { diff --git a/service/workBench.js b/service/workBench.js index d9a6032..a4b86d0 100644 --- a/service/workBench.js +++ b/service/workBench.js @@ -24,4 +24,10 @@ export const getMeterReadingRouteMeterDetail = async function(id) { // 新建一条抄表记录 export const createReading = async function(park, code, data) { return await POST(`/reading/${park}/${code}`, data); +} + + +// 查询符合指定条件的抄表记录 +export const getReadingList = async function(park, keyword, page) { + return await GET(`/reading/${park}?keyword=${keyword}&page=${page}`,); } \ No newline at end of file