childPackage/pages/electricQuery/index.js

@@ -129,12 +129,6 @@ 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'
@@ -151,25 +145,18 @@ Page({
         xAxis: {
           type: 'category',
           boundaryGap: false,
-          data: times
+          data: [...new Set(data?.map(item => item.time))]
         },
         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',
-            data: newList
+            stack: 'Total',
+            data: data?.filter(ele => ele?.meter?.id === item).map(item => item.number)
           }}) 
          
       };

pages/workBench/components/tenement/components/bindMeter/index.js

@@ -1,7 +1,6 @@
 // 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"
@@ -42,20 +41,8 @@ Component({
         type: 'meter'
       })
     },
-    onCancel() {
-      this.setData({
-        show: false,
-        title: "",
-        type: "",
-      })
-      // this.triggerEvent("close")
-    },
     onClose() {
-      this.setData({
+      this.triggerEvent("close")
-        show: false,
-        title: "",
-        type: "",
-      })
     },
     onChange(e) {
       const { name } = e.currentTarget.dataset;
@@ -87,20 +74,8 @@ 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 ? '合闸' : "分闸"
-      })
-    }
   }
 })

pages/workBench/components/tenement/components/bindMeter/index.wxml

@@ -30,14 +30,6 @@
         选择
         </van-button>
     </van-field>
-    <van-field
-        value="{{ status }}"
-        label="状态"
-        title-width="132rpx"
-        border="{{false}}"
-        readonly
-        type="digit"
-    />
     <van-field
         value="{{ overall }}"
         label="表字"
@@ -46,7 +38,7 @@
         bind:change="onChange"
         data-name="overall"
         placeholder="请输入表字"
-        type="digit"
+        type="number"
     />
     <van-field
         value="{{ critical }}"
@@ -56,7 +48,7 @@
         bind:change="onChange"
         data-name="critical"
         placeholder="请输入有功（尖）"
-        type="digit"
+        type="number"
     />
     <van-field
         value="{{ peak }}"
@@ -66,7 +58,7 @@
         bind:change="onChange"
         data-name="peak"
         placeholder="请输入有功（峰）"
-        type="digit"
+        type="number"
     />
     <van-field
         value="{{ overall }}"
@@ -76,7 +68,7 @@
         bind:change="onChange"
         data-name="overall"
         placeholder="请输入有功（平）"
-        type="digit"
+        type="number"
     />
     <van-field
         value="{{ valley }}"
@@ -85,7 +77,7 @@
         border="{{false}}"
         bind:change="onChange"
         data-name="valley"
-        type="digit"
+        type="number"
         placeholder="请输入有功（谷）"
     />
 </view>

pages/workBench/components/tenement/components/unBindMeter/index.js

@@ -4,7 +4,6 @@ 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({
 
@@ -19,11 +18,7 @@ Component({
     meterAddress: String,
     visible:Boolean,
   },
-  observers: {
+
-    "meterId": function(newValue) {
-      this.getMeterDetail(newValue)
-    }
-  },
   /**
    * 组件的初始数据
    */
@@ -47,17 +42,6 @@ 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")
     },

pages/workBench/components/tenement/index.js

@@ -51,9 +51,6 @@ Component({
     },
     async getTenementInfo() {
       const { tenement, park } = this.data;
-      if (!tenement || !park) {
-        return;
-      }
       const { code, message, tenement: data } = await getTenementBackInfo(park, tenement)
       if (code !== OK) {
         alertInfo(message)
@@ -121,18 +118,11 @@ Component({
       this.setData({
         kaihuVisible: false,
         defaultValue: {},
-        title: "编辑",
+        title: "编辑"
-        editType: "",
       })
     },
-    onBindClose() {
+    onKaihuConfirm() {
-      console.log("-----------")
+      // this.getTenementInfo();
-      this.setData({
-        bindVisible: false,
-      })
-    },
-    async onKaihuConfirm() {
-      this.getTenementInfo();
       this.onKaihuClose();
     },
     unbind(e) {

pages/workBench/components/tenement/index.wxml

@@ -105,7 +105,6 @@
     bindcancel="onCancel"
 />
 <kaihu 
-    wx:if="{{kaihuVisible}}"
     park="{{park}}" 
     visible="{{kaihuVisible}}" 
     defaultValue="{{defaultValue}}" 
@@ -121,7 +120,6 @@
     tenement="{{tenement}}"
     tenementName="{{tenementName}}"
     bind:ok="onBindOk"    
-    bind:close="onBindClose"
 />
 
 <unBindMeter 

service/meter.js

@@ -36,8 +36,4 @@ export const getBackTenementMeters = async function(park, tenement) {
 // 拉合闸
 export const handleOperateMeterSwitch = async function({ ids = [], status }) {
   return await PUT(`/equipment/batchSwtich`, { ids, status });
-}
-// 绑定时获取电表的最新信息
-export const getWorkMeterDetail = async function(code = '') {
-  return await GET(`/vx/getWorkMeterDetail?code=${code}`);
 }

utils/index.js

@@ -45,9 +45,9 @@ 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/api3"
       // api = "https://zgd.hbhcbn.com/wxApi"
       // api = "http://127.0.0.1:4523/m1/4143821-0-default"
       break;