水表 ，显示设备信息， 头部

apis/pagejs/water.js

@@ -64,4 +64,22 @@ import request from '@/apis/utils/request'
  		data: data,
  		url: url
  	})
+ }
+ 
+ export function meterDetails(data) {
+ 	var url='/mobile/waterEnergyManage/meterDetails';
+ 	return request({
+ 		method: 'post',
+ 		data: data,
+ 		url: url
+ 	})
+ }
+ 
+ export function waterQuantityStatistics(data) {
+ 	var url='/mobile/waterEnergyManage/waterQuantityStatistics';
+ 	return request({
+ 		method: 'post',
+ 		data: data,
+ 		url: url
+ 	})
  }

config/.env.dev.js

@@ -2,7 +2,7 @@ const UNI_APP = {
 	ProjectName :"e家能源",
 	//BASE_URL: 'http://36.134.122.108/railroad-server/',
 
-	BASE_URL: 'https://charging.xiaoxinda.com/electric-manager-api/', //test
+	BASE_URL: 'http://charging.xiaoxinda.com/electric-manager-api/', //test
 	BASE_URL: 'https://dgj.hbjp.com.cn/electric-manager-api/',
 	
 	//BASE_URL:'http://192.168.77.162:8081/electric-manager-api/', //sz

pages/equipmentDataMonitoring/electronicMonitoringWater.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view 
+		<view   class="background" 
 		:class="{
 			backgroundref:ref
 		}"
@@ -11,7 +11,7 @@
 				@reset="selector2reset">
 			</u-picker-select>
 
-		<!-- 	<view class="navbar-c">
+			<view class="navbar-c">
 				<view class="back" @click="backDataMonitoringList">
 					<u-icon name="arrow-left" color="#fff" size="36"></u-icon>
 				</view>
@@ -19,10 +19,10 @@
 					{{tabsFrom.title}}
 				
 				</view>
-			</view> -->
+			</view>
 			
-			<u-navbar :title="tabsFrom.title" title-color="#101010">
-			</u-navbar>
+			<!-- <u-navbar :title="tabsFrom.title" title-color="#101010">
+			</u-navbar> -->
 		</view>
 		
 		<!-- 设备选择器 -->
@@ -31,24 +31,29 @@
 		</u-select>
 		
 		<!-- 用电量 -->
-		<view class="electricity-consumption" v-if="false">
+		<view class="electricity-consumption" >
 			
 			
         <!-- 统计 -->
 		<view class="statistics-content">
+			<!-- @click="gotoUrl('/pages/equipmentDataMonitoring/electricityConsumptionDetail?id='
+			+FormData.meterId+'&name='+tabsFrom.title+'&type='+FormData.type)"
+			
+			 -->
 			<view class="statistics-item"
-				@click="gotoUrl('/pages/equipmentDataMonitoring/electricityConsumptionDetail?id='
-				+FormData.meterId+'&name='+tabsFrom.title+'&type='+FormData.type)">
+				>
 				<view class="item-title">
-					<image class="img" src="@/assets/img/meterStatistics@3x.png"></image>电量统计(度)
+					<image class="img" src="@/assets/img/meterStatistics@3x.png"></image>统计用水量 (m³)
 				</view>
 				<view class="item-value">
-					<text>{{electricity}}</text>  <u-icon name="arrow-right" color="#cccccc" size="24" ></u-icon>
+					<text>{{electricity}}</text> 
+					 <u-icon name="arrow-right"  v-if="0"
+					color="#cccccc" size="24" ></u-icon>
 				</view>
 			</view>
 			<view class="statistics-item" >
 				<view class="item-title item-title2">
-					<image class="img" src="@/assets/img/electricityStatistics@3x.png"></image>电费统计(元)
+					<image class="img" src="@/assets/img/electricityStatistics@3x.png"></image>水费统计(元)
 				</view>
 				<view class="item-value">
 					{{fee}}
@@ -72,7 +77,7 @@
 
 				</view>
 				<view class="text">
-					用水量 (立方米m³)
+					各时段用水量 (m³)
 
 				</view>
 				<view class="more" @click="tabsFrom.show2=true,params.day=true">
@@ -99,12 +104,12 @@
 
 				</view>
 			</view>
-			<view class="total" v-if="false" >
+			<view class="total"  >
 				<view class="total-item">
-					电量合计：{{sumQuantity}}度
+					用水量：{{sumQuantity}} m³
 				</view>
-				<view class="total-item">
-					电费合计：{{sumFee}}元
+				<view class="total-item" v-if="meterDetail&&meterDetail.price">
+					水费合计：{{(sumQuantity*meterDetail.price).toFixed(2)}}元
 				</view>
 			</view>
 		</view>
@@ -139,7 +144,155 @@
 			</view>
 		</view>
 
+		<view class="equipment-information"  >
+			<view class="title">
+		
+				<view class="icon">
+		
+				</view>
+				<view class="text">
+					设备信息
+		
+				</view>
+				<view class="more" @click="equipmentInfosShow=true">
+					查看全部<u-icon name="arrow-right" size="24" color="#d4d4d4"></u-icon>
+				</view>
+			</view>
+		
+			<view class="infos">
+				<view class="item" style="width: 30%;">
+					<view class="item-title">
+						使用单位
+					</view>
+					<view class="item-value">
+						{{meterDetail.customer}}
+					</view>
+				</view>
+				<view class="border">
+		
+				</view>
+				<view class="item" style="width: 30%;">
+					<view class="item-title">
+						设备编号
+					</view>
+					<view class="item-value">
+						{{meterDetail.deviceNo}}
+					</view>
+				</view>
+				<view class="border">
+		
+				</view>
+				<view class="item" style="width: 30%;">
+					<view class="item-title">
+						水价
+					</view>
+					<view class="item-value">
+						{{meterDetail.price}}吨/元
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 设备信息弹窗 -->
+		
+		<view class="equipment-popup">
+			<u-popup v-model="equipmentInfosShow" mode="bottom" height='90%' border-radius="12">
+				<view class="content">
+					<view class="headline">
+						设备信息
+					</view>
+					<view class="infos">
+						<view class="item">
+							<view class="item-title">
+								设备名称
+							</view>
+							<view class="item-value">
+								{{meterDetail.name}}
+							</view>
+						</view>
+						<view class="item" v-if="false">
+							<view class="item-title">
+								设备类型
+							</view>
+							<view class="item-value">
+								{{meterDetail.deviceTypeN}}
+							</view>
+						</view>
+						<view class="item">
+							<view class="item-title">
+								设备编号
+							</view>
+							<view class="item-value">
+								{{meterDetail.deviceNo}}
+							</view>
+						</view>
+						<view class="item">
+							<view class="item-title">
+								产权单位
+							</view>
+							<view class="item-value">
+								{{meterDetail.companyFullName}}
+							</view>
+						</view>
+						<view class="item" @click="toMeterLocation">
+							<view class="item-title">
+								设备地址
+							</view>
+							<view class="item-value">
+								<span>{{meterDetail.installationAddress}}</span>
+								<image class="img" v-if="0"
+								 src="@/assets/img/riFill-navigation-fill 1.svg"></image>
+							</view>
+						</view>
+						<view class="item">
+							<view class="item-title">
+								地址简称
+							</view>
+							<view class="item-value">
+								{{meterDetail.installationAddressSimple}}
+							</view>
+						</view>
+						<view class="item">
+							<view class="item-title">
+								使用单位
+							</view>
+							<view class="item-value">
+								{{meterDetail.customer}}
+							</view>
+						</view>
+						<view class="item">
+							<view class="item-title">
+								水价
+							</view>
+							<view class="item-value">
+								{{meterDetail.price}}吨/元
+							</view>
+						</view>
+						<view class="item">
+							<view class="item-title">
+								启用时间
+							</view>
+							<view class="item-value">
+								{{meterDetail.enablingTime}}
+							</view>
+						</view>
+						
+						<view class="item" v-if="dtuInfo.id">
+							<view class="item-title">
+								通讯模块
+							</view>
+							<view class="item-value">
+								
+								{{dtuInfo.name}} {{dtuInfo.imei}}（{{meterDetail.address?meterDetail.address:'无'}}）
+							</view>
+						</view>
+					
+					</view>
+					<button class="get" @click="equipmentInfosShow=false">知道了</button>
+				</view>
+			</u-popup>
 		
+		</view>
 
 		
 	</view>
@@ -296,7 +449,7 @@
 				this.getTimeSlotStatistics();
 				//this.getCompanyInfoList();
 				//this.getAbnormalAlarmRecord();
-				//this.getMeterDetails(this.meterId);
+				this.getMeterDetails(this.meterId);
 			},
 			
 			switchBtnApiMethod(node,key){
@@ -351,19 +504,19 @@
 				// });
 			},
 			getMeterDetails(meterId) {
-				return
+				
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
 				})
-				API_electricityMeter.meterDetails({
+				API_water.meterDetails({
 					meterId: meterId
 				}).then((res) => {
 					uni.hideLoading();
 					this.meterDetail = res.data.meter;
 					this.dtuInfo = res.data.dtuInfo;
 					this.meterDetail.name=this.replaceLastTwoWords(this.meterDetail.name)
-					this.codes =this.carhelp.getPersonInfo().codes;
+					//this.codes =this.carhelp.getPersonInfo().codes;
 					
 				}).catch(error => {
 					uni.showToast({
@@ -508,7 +661,7 @@
 						uni.hideLoading();
 					}
 					this.hourMap = response.data.hourMap;
-					// this.sumQuantity = response.data.kwhMap.kwh;
+					this.sumQuantity = response.data.consumptionMap.consumption;
 					// this.sumFee = response.data.kwhMap.fee;
 					
 					this.getBarCharts(this.hourMap, interval);
@@ -524,7 +677,7 @@
 				})
 			},
 			getElectricityStatistics(interval) {
-				return
+				
 				if (!interval) {
 					uni.showLoading({
 						title: "加载中",
@@ -542,16 +695,16 @@
 				// if(obj.type==10){
 				// 	obj.queryDate+="-01"
 				// }
-				API_water.electricityStatistics(obj).then((response) => {
+				API_water.waterQuantityStatistics(obj).then((response) => {
 					if (!interval) {
 						uni.hideLoading();
 					}
 					
 					
 					this.showTop = [0, 0, 0, 0, 0, 0, 0, 0]
-					var electricity = response.data.kwhMap.kwh + "";
-					this.electricity = response.data.kwhMap.kwh;
-					this.fee = response.data.kwhMap.fee;
+					var electricity = response.data.consumptionMap.consumption + "";
+					this.electricity = response.data.consumptionMap.consumption;
+					this.fee = response.data.amount;
 
 					if (electricity) {
 						var sz = electricity.split(".")