Ver Fonte

用电量

wkyy há 1 ano atrás
pai
commit
b75854c6ff

+ 9 - 0
apis/pagejs/index.js

@@ -1,5 +1,14 @@
 import request from '@/apis/utils/request'
 
+export function companyKwhList(data) {
+	var url='/mobile/employee/companyKwhList';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}
+
 export function deviceStatusMonitoring(data) {
 	var url='mobile/employee/deviceStatusMonitoring';
 	return request({

+ 2 - 2
config/.env.dev.js

@@ -2,8 +2,8 @@ const UNI_APP = {
 	ProjectName :"荆鹏电管家",
 	//BASE_URL: 'http://36.134.122.108/railroad-server/',
 
-	// BASE_URL: 'https://charging.xiaoxinda.com/electric-manager-api/', //test
-	BASE_URL: 'https://dgj.hbjp.com.cn/electric-manager-api/',
+	BASE_URL: 'https://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
 	//BASE_URL:'http://192.168.77.222:8086/railroad-server/',

+ 43 - 19
pages/equipmentDataMonitoring/billingRules.vue

@@ -117,28 +117,52 @@
 					}
 
 					var list = res.data.groupPriceList;
-					var list2 = [];
-					var list3 = [
-						{period: '1',name: '尖峰用电',price: 0,timeList:[]},
-						{period: '2',name: '高峰用电',price: 0,timeList:[]},
-						{period: '3',name: '平段用电',price: 0,timeList:[]},
-						{period: '4',name: '谷段用电',price: 0,timeList:[]}
-					];
-					for (var i = 0; i < list.length; i++) {
-						list2 = [...list2, ...list[i].electricPeriodPriceList];
-					}
-					for (var m = 0; m < list2.length; m++) {
-						for (var n = 0; n < list3.length; n++) {
-							if(list2[m].period == list3[n].period) {
-								list3[n].price = list2[m].price;
-								list3[n].timeList.push({
-									startTime: list2[m].startTime,
-									endTime: list2[m].endTime
-								});
+					var cList = list[0];
+					if (cList.chargeType == '1') {
+						var time1 = '00:00';
+						var time2 = '24:00';
+						if (cList.startTime) {
+							time1 = cList.startTime;
+						}
+						if (cList.endTime) {
+							time2 = cList.endTime;
+						}
+						this.electricPeriodPriceList = [{
+							period: '1',
+							name: '单一电价',
+							price: cList.price,
+							timeList:[
+								{
+									startTime: time1,
+									endTime: time2
+								}]
 							}
+						];
+					} else {
+						var list2 = [];
+						var list3 = [
+							{period: '1',name: '尖峰用电',price: 0,timeList:[]},
+							{period: '2',name: '高峰用电',price: 0,timeList:[]},
+							{period: '3',name: '平段用电',price: 0,timeList:[]},
+							{period: '4',name: '谷段用电',price: 0,timeList:[]}
+						];
+						for (var i = 0; i < list.length; i++) {
+							list2 = [...list2, ...list[i].electricPeriodPriceList];
 						}
+						for (var m = 0; m < list2.length; m++) {
+							for (var n = 0; n < list3.length; n++) {
+								if(list2[m].period == list3[n].period) {
+									list3[n].price = list2[m].price;
+									list3[n].timeList.push({
+										startTime: list2[m].startTime,
+										endTime: list2[m].endTime
+									});
+								}
+							}
+						}
+						this.electricPeriodPriceList = list3;
 					}
-					this.electricPeriodPriceList = list3;
+					
 					// console.log(this.electricPeriodPriceList)
 					
 				}).catch(error => {

+ 8 - 5
pages/equipmentDataMonitoring/electricityDetails.vue

@@ -29,7 +29,7 @@
 							{{kwhMap.fee}}元
 						</view>
 					</view>
-					<view class="infos-item" v-if="meterPhase=='3'">
+					<view class="infos-item" v-if="meterPhase=='3' && chargeType=='2'">
 						<view class="item-title">
 							峰时用电 ({{kwhMap.fengPrice}}元/度)
 
@@ -39,7 +39,7 @@
 
 						</view>
 					</view>
-					<view class="infos-item"  v-if="meterPhase=='3'">
+					<view class="infos-item"  v-if="meterPhase=='3' && chargeType=='2'">
 						<view class="item-title">
 							谷时用电 ({{kwhMap.guPrice}}元/度)
 
@@ -49,7 +49,7 @@
 
 						</view>
 					</view>
-					<view class="infos-item" v-if="meterPhase=='3'">
+					<view class="infos-item" v-if="meterPhase=='3' && chargeType=='2'">
 						<view class="item-title">
 							平时用电 ({{kwhMap.pingPrice}}元/度)
 
@@ -59,7 +59,7 @@
 
 						</view>
 					</view>
-					<view class="infos-item" v-if="meterPhase=='3'" >
+					<view class="infos-item" v-if="meterPhase=='3' && chargeType=='2'" >
 						<view class="item-title">
 							尖时用电 ({{kwhMap.jianPrice}}元/度)
 						</view>
@@ -108,7 +108,8 @@
 				kwhMap: {},
 				month: '',
 				name: '',
-				meterPhase: ''
+				meterPhase: '',
+				chargeType: ''
 			}
 		},
 		onLoad(op) {
@@ -134,6 +135,8 @@
 					this.kwhMap = res.data.kwhMap;
 					this.name = res.data.name;
 					this.meterPhase = res.data.meterPhase;
+					this.chargeType = res.data.chargeType;
+					
 					this.getBarCharts(this.graphMap);
 				}).catch(error => {
 					uni.showToast({

+ 270 - 284
pages/equipmentDataMonitoring/equipmentElectricity.vue

@@ -13,8 +13,8 @@
 		<!-- 标签 -->
 		<view class="tabs-box" v-if="companyList.length >= 2">
 			<view class="tabs" :style="{width: companyList.length>4 ? '' : '100%'}">
-				<u-tabs :list="merchantList1" :is-scroll="false" inactive-color="#999999" active-color="#666666" :current="current"
-					@change="change"></u-tabs>
+				<u-tabs :list="merchantList1" :is-scroll="false" inactive-color="#999999" active-color="#666666"
+					:current="current" @change="change"></u-tabs>
 			</view>
 			<view class="icon" @click="popShow=true" v-if="companyList.length >= 4">
 				<u-icon name="arrow-down" color="#999999"></u-icon>
@@ -36,117 +36,106 @@
 				</view>
 			</view>
 		</u-popup>
-		<view class="tatol-main" v-for="(m, i) in kWhList" :key="i" style="margin-bottom: 15px;">
-			<!-- 用电量合计 -->
-			<view class="total" v-if="companyList.length >= 2">
-			<!-- <view class="total"> -->
-				<view class="company">
-					<view class="name">
-						{{m.companyName}}
-					</view>
-					<view class="amount">
-						共 {{m.deviceList.length}} 台设备
-					</view>
-				</view>
-				<view class="infos">
-					<view class="infos-item">
-						<view class="time">
-							今日
+
+		<view class="main" v-for="(item, index) in companyKwhList" :key="index" v-if="current==0"
+			@click="companyChange(item,index)">
+			<view class="item">
+				<view class="item-content">
+					<view class="equipment">
+						<view class="equipment1 ">
+							{{item.name}}
 						</view>
-						<view class="number">
-							{{m.thisDayKwh.toFixed(2)}}
+						<view class="equipment2">
+							共 {{item.listNum}} 台设备
 						</view>
-						
 					</view>
-					<view class="infos-item">
-						<view class="time">
-							本月
-						</view>
-						<view class="number">
-							{{m.thisMonthKwh.toFixed(2)}}
+					<view class="electricity">
+						<view class="electricity-item electricity-item-day">
+							<view class="date">
+								今日
+							</view>
+							<view class="number">
+								{{item.thisDayKwh}}
+							</view>
 						</view>
-						
-					</view>
-					<view class="infos-item">
-						<view class="time">
-							上月
+						<view class="electricity-item">
+							<view class="date">
+								本月
+							</view>
+							<view class="number">
+								{{item.thisMonthKwh}}
+							</view>
 						</view>
-						<view class="number">
-							{{m.lastMonthKwh.toFixed(2)}}
+						<view class="electricity-item">
+							<view class="date">
+								上月
+							</view>
+							<view class="number">
+								{{item.lastMonthKwh}}
+							</view>
 						</view>
-						
 					</view>
 				</view>
-				
+				<view class="more">
+					<u-icon name="arrow-right" color="#d4d4d4" size="24"></u-icon>
+				</view>
 			</view>
+		</view>
 
-			<view class="main">
-				<view class="item" v-for="(item, index) in m.deviceList" :key="index" @click="toElectronicMonitoring(item)">
-					<view class="item-content">
-						<view class="equipment">
-							<view class="equipment1 ">
-								{{item.name}}
-							</view>
-							
-								<view class="equipment2">
-									{{item.installationAddressSimple}}
-								</view>
-								
-							
-							
-							<view class="state" v-if="!item.online">
-								<view class="dot off-line"></view>
-								<view class="text">离线</view>
+		<view class="main" v-for="(item, index) in kWhList" :key="item.id" v-if="current!=0"
+			@click="toElectronicMonitoring(item)">
+			<view class="item">
+				<view class="item-content">
+					<view class="equipment">
+						<view class="equipment1 ">
+							{{item.name}}
+						</view>
+						<view class="equipment2">
+							{{item.installationAddressSimple}}
+						</view>
+
+						<view class="state" v-if="!item.online">
+							<view class="dot off-line"></view>
+							<view class="text">离线</view>
+						</view>
+						<view class="state state2" v-else>
+							<view class="dot on-line"></view>
+							<view class="text">在线</view>
+						</view>
+					</view>
+					<view class="electricity">
+						<view class="electricity-item electricity-item-day">
+							<view class="date">
+								今日
 							</view>
-							
-							<view class="state state2" v-else>
-								<view class="dot on-line"></view>
-								<view class="text">在线</view>
+							<view class="number">
+								{{item.thisDayKwh}}
 							</view>
-							
 						</view>
-						<view class="electricity">
-							<view class="electricity-item electricity-item-day">
-								
-								<view class="date">
-									今日
-								</view>
-								<view class="number">
-									{{item.thisDayKwh}}
-								</view>
+						<view class="electricity-item">
+							<view class="date">
+								本月
 							</view>
-							<view class="electricity-item">
-								
-								<view class="date">
-									本月
-								</view>
-								<view class="number">
-									{{item.thisMonthKwh}}
-								</view>
+							<view class="number">
+								{{item.thisMonthKwh}}
 							</view>
-							<view class="electricity-item">
-								
-								<view class="date">
-									上月
-								</view>
-								<view class="number">
-									{{item.lastMonthKwh}}
-								</view>
+						</view>
+						<view class="electricity-item">
+							<view class="date">
+								上月
+							</view>
+							<view class="number">
+								{{item.lastMonthKwh}}
 							</view>
-							
-							
-											
 						</view>
 					</view>
-					
-					<view class="more">
-								<u-icon name="arrow-right" color="#d4d4d4" size="24"></u-icon>
-							</view>
-					
+				</view>
+				<view class="more">
+					<u-icon name="arrow-right" color="#d4d4d4" size="24"></u-icon>
 				</view>
 			</view>
 		</view>
-		
+
 	</view>
 </template>
 
@@ -157,48 +146,89 @@
 		data() {
 			return {
 				companyList: [], // 商户
-				merchantList1: [], 
+				merchantList1: [],
 				merchantList2: [],
 				kWhList: [], //设备
 				companyId: '',
 				popShow: false,
 				current: 0,
-				allKWhList: []
+				allKWhList: [],
+				companyKwhList: [],
+				pageIndex: 1,
+				recordsTotal: 0,
 			}
 		},
 		onLoad() {
 			this.getCompanyInfoList();
-			// this.getList();
+		},
+		onReachBottom() {
+			if (this.kWhList.length < this.recordsTotal) {
+				this.myLoadmore();
+			}
 		},
 		methods: {
+			companyChange(item, index) {
+				this.current = index + 1;
+				this.companyId = item.id;
+
+				this.getList(true);
+			},
+			getCompanyKwhList(list) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.companyKwhList({
+					companyId: list.id
+				}).then((response) => {
+					uni.hideLoading();
+					var wkh = response.data;
+					var num = 0;
+					if (list.remoteReadingMeterList.length != 0) {
+						num = list.remoteReadingMeterList.length;
+					}
+					var wkhList = {
+						id: list.id,
+						name: list.name,
+						listNum: num,
+						thisDayKwh: wkh.thisDayTotalKwh,
+						thisMonthKwh: wkh.thisMonthTotalKwh,
+						lastMonthKwh: wkh.lastMonthTotalKwh,
+					};
+					this.companyKwhList.push(wkhList);
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
 			getCompanyInfoList() {
-				this.kWhList = [];
-				this.allKWhList = [];
 
 				API.deviceCompanyList().then((response) => {
 					var list = response.data.companyInfoList;
+					this.companyList = list;
+
 					var mList1 = [];
 					var mList2 = [];
-					
 					mList1.push({
 						id: '',
 						name: '全部'
 					});
-					
+
 					for (var i = 0; i < list.length; i++) {
 						if (i >= 3) {
 							mList2.push(list[i]);
 						} else {
 							mList1.push(list[i]);
 						}
-						
-						this.getList(list[i].id,list[i].name);
+
+						this.getCompanyKwhList(list[i]);
 					}
 
-					this.companyList = list;
 					this.merchantList1 = mList1;
 					this.merchantList2 = mList2;
-					
+
 				}).catch(error => {
 					uni.showToast({
 						title: error,
@@ -206,67 +236,31 @@
 					})
 				})
 			},
-			getList(companyId,companyName) {
+			myLoadmore() {
+				this.pageIndex += 1;
+				this.getList();
+			},
+			getList(bl) {
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
 				})
+				if (bl) {
+					this.kWhList = [];
+					this.pageIndex = 1;
+				}
 				var data = {
-					pageIndex: 1,
-					pageSize: 100,
-					companyId: companyId
+					pageIndex: this.pageIndex,
+					pageSize: 5,
+					companyId: this.companyId
 				};
 				API.homePageKwh(data).then((res) => {
-					var dataList = res.data.data;
-					// var idList = [];
-					// var list = [];
-					// for (var i = 0; i < dataList.length; i++) {
-					// 	idList.push(dataList[i].companyId);
-					// }
-					// idList = Array.from(new Set(idList));
-					// for (var m = 0; m < idList.length; m++) {
-					// 	list.push({
-					// 		companyId: idList[m],
-					// 		companyName: '',
-					// 		thisDayKwh: 0,
-					// 		thisMonthKwh: 0,
-					// 		lastMonthKwh: 0,
-					// 		deviceList: []
-					// 	});
-					// 	for (var n = 0; n < dataList.length; n++) {
-					// 		if(dataList[n].companyId == idList[m]) {
-					// 			list[m].companyName = dataList[n].companyName;
-					// 			list[m].deviceList.push(dataList[n]);
-					// 			list[m].thisDayKwh += dataList[n].thisDayKwh;
-					// 			list[m].thisMonthKwh += dataList[n].thisMonthKwh;
-					// 			list[m].lastMonthKwh += dataList[n].lastMonthKwh;
-					// 		}
-					// 	}
-					// }
-					// console.log(list)
-					
-					var list = {
-						companyId: companyId,
-						companyName: companyName,
-						thisDayKwh: 0,
-						thisMonthKwh: 0,
-						lastMonthKwh: 0,
-						deviceList: dataList
-					};
-					for (var n = 0; n < dataList.length; n++) {
-						list.thisDayKwh += dataList[n].thisDayKwh;
-						list.thisMonthKwh += dataList[n].thisMonthKwh;
-						list.lastMonthKwh += dataList[n].lastMonthKwh;
-					}
-					
-					this.kWhList.push(list);
-					this.allKWhList.push(list);
-					
-					// console.log(this.kWhList.length)
-					// console.log(this.companyList.length)
-					if(this.kWhList.length == this.companyList.length) {
-						uni.hideLoading();
-					}
+					uni.hideLoading();
+					this.kWhList = [
+						...this.kWhList,
+						...res.data.data
+					];
+					this.recordsTotal = res.data.recordsTotal;
 				}).catch(error => {
 					uni.showToast({
 						title: error,
@@ -274,38 +268,22 @@
 					})
 				})
 			},
-			merchantChange(item,index) {
+			merchantChange(item, index) {
 				var m = item;
 				var n = this.merchantList1[this.current];
 				this.merchantList1[this.current] = m;
 				this.merchantList2[index] = n;
 				this.companyId = item.id;
 				this.popShow = false;
-				
-				// this.getList();
-				var list = [];
-				for (var i = 0; i < this.allKWhList.length; i++) {
-					if(this.companyId == this.allKWhList[i].companyId) {
-						list.push(this.allKWhList[i]);
-					}
-				}
-				this.kWhList = list;
+
+				this.getList(true);
 			},
 			change(index) {
 				this.current = index;
 				this.companyId = this.merchantList1[index].id;
 
-				// this.getList();
-				if(this.merchantList1[index].name != '全部') {
-					var list = [];
-					for (var i = 0; i < this.allKWhList.length; i++) {
-						if(this.companyId == this.allKWhList[i].companyId) {
-							list.push(this.allKWhList[i]);
-						}
-					}
-					this.kWhList = list;
-				} else {
-					this.kWhList = this.allKWhList;
+				if (index != 0) {
+					this.getList(true);
 				}
 			},
 			backStatistics() {
@@ -313,8 +291,8 @@
 			},
 			toElectronicMonitoring(item) {
 				uni.navigateTo({
-					url: '/pages/equipmentDataMonitoring/electronicMonitoring?id=' + item.id + '&name=' + item.name
-						+ '&companyId=' + item.companyId
+					url: '/pages/equipmentDataMonitoring/electronicMonitoring?id=' + item.id + '&name=' + item.name +
+						'&companyId=' + item.companyId
 				})
 			}
 		}
@@ -322,9 +300,10 @@
 </script>
 
 <style lang="scss" scoped>
-	page{
+	page {
 		padding-bottom: 100rpx;
 	}
+
 	.back {
 		z-index: 999;
 		width: 200rpx;
@@ -333,7 +312,7 @@
 	/deep/.u-drawer-content {
 		margin-top: 88rpx;
 	}
-	
+
 	/deep/.u-tab-item {
 		width: 25% !important;
 		flex: none !important;
@@ -346,6 +325,7 @@
 		padding: 32rpx 0;
 		padding-right: 32rpx;
 		justify-content: space-between;
+		border-bottom: 1px solid rgba(232, 232, 232, 1);
 
 		.tabs {
 			width: 88%;
@@ -382,7 +362,7 @@
 			margin-bottom: 40rpx;
 		}
 	}
-	
+
 	/deep/.u-tab-item {
 		width: 25% !important;
 		flex: none !important;
@@ -392,12 +372,13 @@
 	.total {
 		padding: 24rpx 32rpx;
 		background: linear-gradient(90deg, rgba(49, 110, 207, 1) 2%, rgba(37, 138, 255, 1) 100%);
-		
+
 
 		.company {
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
+
 			.name {
 				color: rgba(255, 255, 255, 1);
 				font-size: 36rpx;
@@ -418,10 +399,10 @@
 			width: 93%;
 
 			.infos-item {
-				
+
 				display: flex;
 				width: 33.3%;
-				
+
 
 				.number {
 					color: rgba(255, 255, 255, 1);
@@ -432,11 +413,11 @@
 
 				.time {
 					color: #f2f4f6;
-					
+
 				}
 			}
 		}
-		
+
 	}
 
 
@@ -446,114 +427,119 @@
 		background-color: #fff;
 		padding: 26rpx 32rpx;
 
-		
-		.item:last-of-type{
+		.item:last-of-type {
 			border: none;
 		}
-			.item {
-				padding: 16rpx 0;
+
+		.item {
+			padding: 16rpx 0;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border-bottom: 1px solid rgba(245, 245, 245, 1);
+
+			.item-content {
+				width: 93%;
+			}
+
+			.equipment {
+
 				display: flex;
 				align-items: center;
-				justify-content: space-between;
-				border-bottom: 1px solid rgba(245, 245, 245, 1);
-		   .item-content{
-			   width: 93%;
-		   }
-				.equipment {
-					
-					display: flex;
-					align-items: center;
-		
-					
-					.equipment1 {
-						color: rgba(51, 51, 51, 1);
-						font-size: 32rpx;
-						max-width: 40%;
-						font-weight: bold;
-						
-						white-space: nowrap;
-						overflow: hidden;
-						text-overflow: ellipsis;
-					}
-		
-					.equipment2 {
-						color: rgba(119,119,119,1);
-						margin-left: 16rpx;
-						max-width: 40%;
-						white-space: nowrap;
-						overflow: hidden;
-						text-overflow: ellipsis;
-		
-		
-		
-						
-		
-						
-					}
+
+
+				.equipment1 {
+					color: rgba(51, 51, 51, 1);
+					font-size: 32rpx;
+					max-width: 40%;
+					font-weight: bold;
+
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
 				}
-				// 状态
-				.state {
-					
-					
-					display: flex;
-					align-items: center;
-					color: rgba(255, 123, 0, 1);
+
+				.equipment2 {
+					color: rgba(119, 119, 119, 1);
+					margin-left: 16rpx;
+					max-width: 40%;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+
+
+
+
+
+
+				}
+			}
+
+			// 状态
+			.state {
+
+
+				display: flex;
+				align-items: center;
+				color: rgba(255, 123, 0, 1);
+				margin-left: auto;
+
+				.dot {
+					margin-right: 8rpx;
+
+					width: 16rpx;
+					height: 16rpx;
+					background-color: rgba(255, 123, 0, 1);
+					border-radius: 999px;
 					margin-left: auto;
-				
-					.dot {
-						margin-right: 8rpx;
-						
-						width: 16rpx;
-						height: 16rpx;
-						background-color: rgba(255, 123, 0, 1);
-						border-radius: 999px;
-						margin-left: auto;
-						
-					}
-				
-					.off-line {
-				   
-						background-color: rgba(255, 123, 0, 1);
-				
-					}
-				
-					.on-line {
-						background-color: rgba(0, 185, 98, 1);
-					}
+
+				}
+
+				.off-line {
+
+					background-color: rgba(255, 123, 0, 1);
+
 				}
-				.state2 {
-					color: rgba(0, 185, 98, 1);
+
+				.on-line {
+					background-color: rgba(0, 185, 98, 1);
 				}
-		
-				.electricity {
+			}
+
+			.state2 {
+				color: rgba(0, 185, 98, 1);
+			}
+
+			.electricity {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				margin-top: 8rpx;
+				text-align: center;
+
+				.electricity-item {
 					display: flex;
-					justify-content: space-between;
 					align-items: center;
-					
-					margin-top:8rpx;
-					text-align: center;
-					
-					.electricity-item {
-						display: flex;
-						align-items: center;	
-		              width: 33.3%;
-						.number {
-							color: rgba(51, 51, 51, 1);
-							
-							font-weight: bold;
-							font-size: 32rpx;
-							margin-left: 8rpx;
-						}
-		
-						.date {
-							color: rgba(119, 119, 119, 1);
-							
-							
-						}
+					width: 33.3%;
+
+					.number {
+						color: rgba(51, 51, 51, 1);
+
+						font-weight: bold;
+						font-size: 32rpx;
+						margin-left: 8rpx;
+					}
+
+					.date {
+						color: rgba(119, 119, 119, 1);
+
+
 					}
-					
 				}
+
 			}
-		
+		}
+
 	}
 </style>

+ 5 - 5
pages/statistics/statistics.vue

@@ -630,10 +630,10 @@
 				}
 
 				if (!interval) {
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})
+					// uni.showLoading({
+					// 	title: "加载中",
+					// 	mask: true,
+					// })
 				}
 				API.homePageKwh({
 					pageIndex: this.pageIndexp,
@@ -641,7 +641,7 @@
 					companyId: this.companyId
 				}).then((response) => {
 					if (!interval) {
-						uni.hideLoading();
+						// uni.hideLoading();
 					}
 					this.kWhList = response.data.data;
 					this.totalPagep = response.data.totalPage;