修改了开户的时候无法关掉选择的问题,电量图表的错位问题
This commit is contained in:
		@@ -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 ? '合闸' : "分闸"
 | 
			
		||||
      })
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
})
 | 
			
		||||
@@ -30,6 +30,14 @@
 | 
			
		||||
        选择
 | 
			
		||||
        </van-button>
 | 
			
		||||
    </van-field>
 | 
			
		||||
    <van-field
 | 
			
		||||
        value="{{ status }}"
 | 
			
		||||
        label="状态"
 | 
			
		||||
        title-width="132rpx"
 | 
			
		||||
        border="{{false}}"
 | 
			
		||||
        readonly
 | 
			
		||||
        type="digit"
 | 
			
		||||
    />
 | 
			
		||||
    <van-field
 | 
			
		||||
        value="{{ overall }}"
 | 
			
		||||
        label="表字"
 | 
			
		||||
@@ -38,7 +46,7 @@
 | 
			
		||||
        bind:change="onChange"
 | 
			
		||||
        data-name="overall"
 | 
			
		||||
        placeholder="请输入表字"
 | 
			
		||||
        type="number"
 | 
			
		||||
        type="digit"
 | 
			
		||||
    />
 | 
			
		||||
    <van-field
 | 
			
		||||
        value="{{ critical }}"
 | 
			
		||||
@@ -48,7 +56,7 @@
 | 
			
		||||
        bind:change="onChange"
 | 
			
		||||
        data-name="critical"
 | 
			
		||||
        placeholder="请输入有功(尖)"
 | 
			
		||||
        type="number"
 | 
			
		||||
        type="digit"
 | 
			
		||||
    />
 | 
			
		||||
    <van-field
 | 
			
		||||
        value="{{ peak }}"
 | 
			
		||||
@@ -58,7 +66,7 @@
 | 
			
		||||
        bind:change="onChange"
 | 
			
		||||
        data-name="peak"
 | 
			
		||||
        placeholder="请输入有功(峰)"
 | 
			
		||||
        type="number"
 | 
			
		||||
        type="digit"
 | 
			
		||||
    />
 | 
			
		||||
    <van-field
 | 
			
		||||
        value="{{ overall }}"
 | 
			
		||||
@@ -68,7 +76,7 @@
 | 
			
		||||
        bind:change="onChange"
 | 
			
		||||
        data-name="overall"
 | 
			
		||||
        placeholder="请输入有功(平)"
 | 
			
		||||
        type="number"
 | 
			
		||||
        type="digit"
 | 
			
		||||
    />
 | 
			
		||||
    <van-field
 | 
			
		||||
        value="{{ valley }}"
 | 
			
		||||
@@ -77,7 +85,7 @@
 | 
			
		||||
        border="{{false}}"
 | 
			
		||||
        bind:change="onChange"
 | 
			
		||||
        data-name="valley"
 | 
			
		||||
        type="number"
 | 
			
		||||
        type="digit"
 | 
			
		||||
        placeholder="请输入有功(谷)"
 | 
			
		||||
    />
 | 
			
		||||
</view>
 | 
			
		||||
 
 | 
			
		||||
@@ -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")
 | 
			
		||||
    },
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user