diff --git a/childPackage/pages/electricQuery/index.js b/childPackage/pages/electricQuery/index.js index 264c586..7f32ce0 100644 --- a/childPackage/pages/electricQuery/index.js +++ b/childPackage/pages/electricQuery/index.js @@ -129,6 +129,12 @@ Page({ devicePixelRatio: getPixelRatio(), }); const ids = [...new Set(data?.map(item => item?.meter?.id))] + const point = data?.[0]?.time?.slice(-1) + 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")); + const options = { tooltip: { trigger: 'axis' @@ -145,18 +151,25 @@ Page({ xAxis: { type: 'category', boundaryGap: false, - data: [...new Set(data?.map(item => item.time))] + data: times }, yAxis: { type: 'value' }, 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 null + }) return { name: element?.meter?.address, type: 'line', - stack: 'Total', - data: data?.filter(ele => ele?.meter?.id === item).map(item => item.number) + data: newList }}) }; diff --git a/pages/workBench/components/tenement/components/bindMeter/index.js b/pages/workBench/components/tenement/components/bindMeter/index.js index f9aec7b..1261257 100644 --- a/pages/workBench/components/tenement/components/bindMeter/index.js +++ b/pages/workBench/components/tenement/components/bindMeter/index.js @@ -1,6 +1,7 @@ // pages/workBench/components/tenement/components/bindMeter/index.js // 0015980101 import { bindMeter, } from "../../../../../../service/tenement" +import { getWorkMeterDetail } from "../../../../../../service/meter" import { alertInfo, alertSuccess } from "../../../../../../utils/index"; import request from "../../../../../../utils/request" import dayjs from "../../../../../../utils/dayjs" @@ -41,8 +42,20 @@ Component({ type: 'meter' }) }, + onCancel() { + this.setData({ + show: false, + title: "", + type: "", + }) + // this.triggerEvent("close") + }, onClose() { - this.triggerEvent("close") + this.setData({ + show: false, + title: "", + type: "", + }) }, onChange(e) { const { name } = e.currentTarget.dataset; @@ -74,8 +87,20 @@ Component({ meterName: data.address, show: false, }) + this.getMeterDetail(data.id); break; } }, + async getMeterDetail(id) { + const { code, message, data } = await getWorkMeterDetail(id) + if (code !== OK) { + alertInfo(message) + return; + } + this.setData({ + overall: Number(data?.overall || 0), + status: data?.breakType ? '合闸' : "分闸" + }) + } } }) \ No newline at end of file diff --git a/pages/workBench/components/tenement/components/bindMeter/index.wxml b/pages/workBench/components/tenement/components/bindMeter/index.wxml index f350b6e..4a6c842 100644 --- a/pages/workBench/components/tenement/components/bindMeter/index.wxml +++ b/pages/workBench/components/tenement/components/bindMeter/index.wxml @@ -30,6 +30,14 @@ 选择 + diff --git a/pages/workBench/components/tenement/components/unBindMeter/index.js b/pages/workBench/components/tenement/components/unBindMeter/index.js index f31513c..32d94ca 100644 --- a/pages/workBench/components/tenement/components/unBindMeter/index.js +++ b/pages/workBench/components/tenement/components/unBindMeter/index.js @@ -4,6 +4,7 @@ import { unbindMeter, } from "../../../../../../service/tenement" import request from "../../../../../../utils/request" import { alertInfo, alertSuccess } from "../../../../../../utils/index"; const { OK } = request +import { getWorkMeterDetail } from "../../../../../../service/meter" Component({ @@ -18,7 +19,11 @@ Component({ meterAddress: String, visible:Boolean, }, - + observers: { + "meterId": function(newValue) { + this.getMeterDetail(newValue) + } + }, /** * 组件的初始数据 */ @@ -42,6 +47,17 @@ Component({ type: 'meter' }) }, + async getMeterDetail(id) { + const { code, message, data } = await getWorkMeterDetail(id) + if (code !== OK) { + alertInfo(message) + return; + } + this.setData({ + overall: Number(data?.overall || 0), + status: data?.breakType ? '合闸' : "分闸" + }) + }, onClose() { this.triggerEvent("close") }, diff --git a/pages/workBench/components/tenement/index.js b/pages/workBench/components/tenement/index.js index 6d759a3..92f4ff4 100644 --- a/pages/workBench/components/tenement/index.js +++ b/pages/workBench/components/tenement/index.js @@ -125,6 +125,12 @@ Component({ editType: "", }) }, + onBindClose() { + console.log("-----------") + this.setData({ + bindVisible: false, + }) + }, async onKaihuConfirm() { this.getTenementInfo(); this.onKaihuClose(); diff --git a/pages/workBench/components/tenement/index.wxml b/pages/workBench/components/tenement/index.wxml index b8cb555..eb96997 100644 --- a/pages/workBench/components/tenement/index.wxml +++ b/pages/workBench/components/tenement/index.wxml @@ -121,6 +121,7 @@ tenement="{{tenement}}" tenementName="{{tenementName}}" bind:ok="onBindOk" + bind:close="onBindClose" />