修改

apis/pagejs/electricityMeter.js

@@ -1,5 +1,15 @@
 import request from '@/apis/utils/request'
 
+//能源中心电表修改信息
+export function updateMeter(data) {
+	var url='/mobile/employeeElectricityMeter/updateMeter';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}
+
 //能源中心换绑电表
 export function charngeMeter(data) {
 	var url='/mobile/employeeElectricityMeter/charngeMeter';

pages/equipmentInformation/equipmentDetails.vue

@@ -1,6 +1,9 @@
 <template>
 	<view>
 		<u-navbar title="设备详情" title-color="#101010">
+			<view class="slot" style="color: #1677FF;" slot="right" @click="bindShow2=true">
+				修改
+			</view>
 		</u-navbar>
 		<view class="background">
 
@@ -123,43 +126,104 @@
 		<!-- 确认弹窗 -->
 		<view class="modal">
 			<u-modal v-model="bindShow" :show-title="false" :show-cancel-button="true" @confirm="submit"
-				:cancel-text="cancelText" :confirm-text="confirmText" @cancel="cancel">
+				cancel-text="暂不绑定" :confirm-text="confirmText" @cancel="cancel">
 				<view class="headline">
 					请确认您要绑定的账户信息
-
 				</view>
 				<view class="infos">
 					<view class="item">
 						<view class="title">
-							用户名称
+							设备名称
 						</view>
 						<view class="value">
-							{{findByMeter.name}}
-
+							<u-input v-model="findByMeter.name" :border="true"></u-input>
+						</view>
+					</view>
+					<view class="item">
+						<view class="title">
+							设备地址
+						</view>
+						<view class="value">
+							<u-input v-model="findByMeter.installationAddress" type="textarea" :border="true"></u-input>
+						</view>
+					</view>
+					<view class="item">
+						<view class="title">
+							地址简称
+						</view>
+						<view class="value">
+							<u-input v-model="findByMeter.installationAddressSimple" :border="true"></u-input>
 						</view>
 					</view>
 					<view class="item">
 						<view class="title">
 							电表编号
-
-
 						</view>
 						<view class="value">
 							{{findByMeter.deviceNo}}
-
 						</view>
 					</view>
 					<view class="item">
 						<view class="title">
-							所在地址
+							设备类型
 						</view>
 						<view class="value">
-							{{findByMeter.installationAddress}}
+							{{findByMeter.deviceTypeN}}
 						</view>
 					</view>
-
 				</view>
+			</u-modal>
+		</view>
 
+		<!-- 账户信息弹窗 -->
+		<view class="modal">
+			<u-modal v-model="bindShow2" :show-title="false" :show-cancel-button="true" @confirm="submitUpdate" cancel-text="取消"
+				confirm-text="修改">
+				<view class="headline">
+					电表信息
+				</view>
+				<view class="infos">
+					<view class="item">
+						<view class="title">
+							设备名称
+						</view>
+						<view class="value">
+							<u-input v-model="updateByMeter.name" :border="true"></u-input>
+						</view>
+					</view>
+					<view class="item">
+						<view class="title">
+							设备地址
+						</view>
+						<view class="value">
+							<u-input v-model="updateByMeter.address" type="textarea" :border="true"></u-input>
+						</view>
+					</view>
+					<view class="item">
+						<view class="title">
+							地址简称
+						</view>
+						<view class="value">
+							<u-input v-model="updateByMeter.addressSimple" :border="true"></u-input>
+						</view>
+					</view>
+					<view class="item">
+						<view class="title">
+							电表编号
+						</view>
+						<view class="value">
+							{{meterDetail.deviceNo}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="title">
+							设备类型
+						</view>
+						<view class="value">
+							{{meterDetail.deviceTypeN}}
+						</view>
+					</view>
+				</view>
 			</u-modal>
 		</view>
 
@@ -181,11 +245,18 @@
 	export default {
 		data() {
 			return {
+				updateByMeter: {
+					id: '',
+					name: '',
+					address: '',
+					addressSimple: '',
+				},
 				newMaterId: '',
 				oldMeterId: '',
 				meterDetail: {},
 				materId: '',
 				bindShow: false,
+				bindShow2: false,
 				meterNo: '',
 				findByMeter: {},
 				type: '', //绑定权限
@@ -212,6 +283,29 @@
 			}
 		},
 		methods: {
+			//修改
+			getUpdateMeter(obj) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API_electricityMeter.updateMeter(obj).then((response) => {
+					uni.hideLoading();
+					uni.showToast({
+						title: '修改成功',
+						icon: "success"
+					})
+					this.getMeterDetails(obj.id);
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			submitUpdate() {
+				this.getUpdateMeter(this.updateByMeter);
+			},
 			//扫码识别
 			getScanCode() {
 				this.getScanCode1()
@@ -244,6 +338,25 @@
 				}
 			},
 			submit() {
+				var sz=['name','installationAddress','installationAddressSimple']
+				var sz2=['name','address','addressSimple']
+				
+				var bl=false;
+				var obj={
+					id:this.updateByMeter.id
+				};
+				for(var i in sz){
+					var key=sz[i]
+					var key2=sz2[i]
+					if(this.updateByMeter[key]!=this.findByMeter[key]){
+						bl=true;
+					}
+					obj[key2]=this.updateByMeter[key]
+				}
+				if(bl) {
+					this.getUpdateMeter(obj);
+				}
+				
 				if (this.change) {
 					this.getCharngeMeter();
 				} else {
@@ -287,10 +400,6 @@
 					oldMeterId: this.oldMeterId
 				}).then((response) => {
 					uni.hideLoading()
-					// this.cancelText = '暂不绑定';
-					// this.confirmText = '确认绑定';
-					// this.materId = this.newMaterId;
-					// this.getMeterDetails(this.newMaterId);
 					let pages = getCurrentPages(); // 当前页面
 					let beforePage = pages[pages.length - 2]; //上一个页面
 					uni.navigateBack({
@@ -326,6 +435,10 @@
 					// console.log(response)
 					this.bindShow = true;
 					this.findByMeter = response.data.meter;
+					this.updateByMeter.id = response.data.meter.id;
+					this.updateByMeter.name = response.data.meter.name;
+					this.updateByMeter.address = response.data.meter.installationAddress;
+					this.updateByMeter.addressSimple = response.data.meter.installationAddressSimple;
 
 					if (!this.change) {
 						this.materId = response.data.meter.id;
@@ -354,6 +467,10 @@
 				}).then((res) => {
 					uni.hideLoading();
 					this.meterDetail = res.data.meter;
+					this.updateByMeter.id = res.data.meter.id;
+					this.updateByMeter.name = res.data.meter.name;
+					this.updateByMeter.address = res.data.meter.installationAddress;
+					this.updateByMeter.addressSimple = res.data.meter.installationAddressSimple;
 				}).catch(error => {
 					uni.showToast({
 						title: error,

pages/statistics/statistics.vue

@@ -239,7 +239,7 @@
 						</view>
 					</view>
 					<!-- 监控信息 -->
-					<view class="infos">
+					<view class="infos" v-if="item.remoteMonitorRecord != null">
 						<view class="infos-item">
 							<view class="icon">
 								当前电流：