Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-housekeep-electric

# Conflicts:
#	pages/equipmentDataMonitoring/equipmentElectricity.vue

pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -6,6 +6,8 @@
 			<!-- <u-picker  title="设备选择" v-model="equipmentShow" 
 			mode="multiSelector"   :default-selector='[0, 1]' :range="multiSelector">
 			</u-picker> -->
+			<u-picker v-model="tabsFrom.show1" mode="selector" :range="tabsFrom.selector1" range-key="label"
+				@confirm="selector1confirm"></u-picker>
 			<u-select v-model="equipmentShow" mode="mutil-column-auto" :list="equipmentList" @confirm="confirm">
 
 			</u-select>
@@ -14,71 +16,18 @@
 			<u-picker-select title="日期选择" v-model="tabsFrom.show2" :defaultTime="tabsFrom.show2Index" :endYear="endYear"
 				mode="time" :params="params" @confirm="selector2confirm" @reset="selector2reset"></u-picker-select>
 
-			<!-- 		<u-navbar :background="background" back-icon-color="#fff" title="联通公司" title-color="#fff">
-				<view class="u-nav-slot" slot="right" @click="tabsFrom.show2=true,params.day=true">
-					<image class="img" src="@/assets/img/riLine-calendar-todo-line 1.svg" mode=""></image>
-				</view>
-			</u-navbar> -->
 			<view class="navbar-c">
 				<view class="back" @click="backDataMonitoringList">
 					<u-icon name="arrow-left" color="#fff" size="36"></u-icon>
 				</view>
 				<view class="title">
-					{{title}}<u-icon v-if="false" name="arrow-down" color="#fff" size="24"
-						@click="equipmentShow=true"></u-icon>
+					{{tabsFrom.title}}
+					<!-- <u-icon name="arrow-down" color="#fff" size="24" @click="equipmentShow=true"></u-icon> -->
+					<u-icon name="arrow-down" color="#fff" size="24" @click="tabsFrom.show1=true"></u-icon>
 				</view>
-				<!-- <view class="right" @click="tabsFrom.show2=true">
-					<image class="img" src="@/assets/img/riLine-calendar-todo-line 1.svg" mode=""></image>
-				</view> -->
 			</view>
-			<!-- 日期 -->
-			<!-- <view class="date-box">
-				<view class="item item-today">
-					<view class="date">
-						26
-					</view>
-					<view class="week ">
-						今天
-					</view>
-					<view class="dot">
-
-					</view>
-				</view>
-				<view class="item">
-					<view class="date">
-						27
-					</view>
-					<view class="week">
-						周六
-					</view>
-				</view>
-				<view class="item">
-					<view class="date">
-						28
-					</view>
-					<view class="week">
-						周日
-					</view>
-				</view>
-				<view class="item">
-					<view class="date">
-						29
-					</view>
-					<view class="week">
-						周一
-					</view>
-				</view>
-				<view class="item">
-					<view class="date">
-						30
-					</view>
-					<view class="week">
-						周二
-					</view>
-				</view>
-			</view> -->
-
 		</view>
+		
 		<!-- 用电量 -->
 		<view class="electricity-consumption">
 			<view class="title">
@@ -163,14 +112,13 @@
 		<!-- 各时段用电量 -->
 		<view class="electricity-chart">
 			<view class="title">
-				<view class="icon">
-
-				</view>
 				<view class="text">
-					各时段用电量 (度)
+					<view class="icon">
+
+					</view> 各时段用电量 (度)
 
 				</view>
-				<view class="date" @click="tabsFrom.show2=true,params.day=true">
+				<view @click="tabsFrom.show2=true,params.day=true">
 					{{queryDay}}<u-icon name="arrow-down"></u-icon>
 				</view>
 			</view>
@@ -179,6 +127,9 @@
 				<view id="barEcharts" style="min-height:440rpx;">
 
 				</view>
+				<view style="
+				text-align: center;
+					background: white;" ></view>
 			</view>
 		</view>
 		<!-- 异常波动 -->
@@ -446,7 +397,6 @@
 			return {
 				equipmentInfosShow:false,
 				kWhList: [],
-				title: '',
 				queryDay: '',
 				showTop: [0, 0, 0, 0, 0, 0, 0, 0],
 				FormData: {
@@ -471,17 +421,14 @@
 						children: [{
 								value: 2,
 								label: '荆鹏集团01',
-
 							},
 							{
 								value: 3,
 								label: '荆鹏集团02',
-
 							},
 							{
 								value: 4,
 								label: '荆鹏集团03',
-
 							}
 						]
 					},
@@ -501,7 +448,6 @@
 							{
 								value: 8,
 								label: '荆州院子03',
-
 							}
 						]
 					}
@@ -539,51 +485,70 @@
 					backgroundColor: '#1677FF',
 				},
 				list: [{
-						id: 0,
-						name: '总用电量',
-						disabled: false
-					},
-					{
-						id: 4,
-						name: '当日用电量',
-						disabled: false
-					},
-					{
-						id: 1,
-						name: '当月用电量',
-						disabled: false
-					}, {
-						id: 3,
-						name: '当年用电量',
-						disabled: false
-					}, {
-						id: 5,
-						name: '去年用电量',
-						disabled: false
-					}, {
-						id: 10,
-						name: '指定月份',
-						disabled: false
-					}
-				],
-				value: '0',
+					id: 4,
+					name: '当日用电量',
+					disabled: false
+				}, {
+					id: 1,
+					name: '当月用电量',
+					disabled: false
+				}, {
+					id: 2,
+					name: '上月用电量',
+					disabled: false
+				}, {
+					id: 3,
+					name: '当年用电量',
+					disabled: false
+				}, {
+					id: 0,
+					name: '总用电量',
+					disabled: false
+				}, {
+					id: 10,
+					name: '指定月份',
+					disabled: false
+				}],
+				value: '2',
 			};
 		},
 		onLoad(op) {
 			if (op.id) {
 				this.FormData.meterId = op.id;
 				this.FormData2.meterId = op.id;
+				this.tabsFrom.title = op.name;
 			}
 			this.endYear = new Date().getFullYear();
 			this.FormData.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
 			this.FormData2.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
-			this.FormData.type = 0;
+			this.FormData.type = 2;
 
-			this.getTimeSlotStatistics();
 			this.getElectricityStatistics();
+			this.getTimeSlotStatistics();
 			this.getList();
 		},
+		onReady() {
+			this.getBarCharts(false);
+		},
 		methods: {
+			selector1confirm(e) {
+
+				var index = e[0];
+				this.tabsFrom.show1Index = index;
+				this.tabsFrom.show1Text = this.tabsFrom.selector1[index].label;
+				this.tabsFrom.title = this.tabsFrom.selector1[index].label;
+
+				this.FormData.meterId = this.tabsFrom.selector1[index].value;
+				this.FormData.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
+				this.FormData2.meterId = this.tabsFrom.selector1[index].value;
+				this.FormData2.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
+
+				this.FormData.type = 2;
+				this.value = '2';
+
+				this.getTimeSlotStatistics();
+				this.getElectricityStatistics();
+			},
 			queryDate(queryTime, day) {
 
 				if (day) {
@@ -591,19 +556,15 @@
 					//this.FormData2.type =day?"9":"10"
 					//this.value="-1"
 
-					this.getTimeSlotStatistics()
-
+					this.getTimeSlotStatistics();
 				} else {
 
 					this.FormData.queryDate = queryTime + "-01";
-					this.FormData.type = "10"
+					this.FormData.type = "10";
 					//this.value="-1"
 
-					this.getElectricityStatistics()
-
+					this.getElectricityStatistics();
 				}
-
-
 			},
 			getList() {
 				uni.showLoading({
@@ -617,11 +578,13 @@
 				API.homePageKwh(data).then((res) => {
 					uni.hideLoading()
 					this.kWhList = res.data.data;
-					for (var i = 0; i < this.kWhList.length; i++) {
-						if (this.kWhList[i].id == this.FormData.meterId) {
-							this.title = this.kWhList[i].name;
+					this.tabsFrom.selector1 = [];
+					this.tabsFrom.selector1 = this.kWhList.map(item => {
+						return {
+							label: item.name,
+							value: item.id
 						}
-					}
+					})
 				}).catch(error => {
 					uni.showToast({
 						title: error,
@@ -696,11 +659,17 @@
 					});
 				}
 				this.myChart.clear();
-				var data1 = [];
-				var data2 = [];
-				for (var i in list) {
-					data1.push(i)
-					data2.push(list[i])
+
+				var data1 = ['0-2点', '3-4点', '5-6点', '7-8点', '9-10点', '11-12点', '13-14点', '15-16点',
+					'17-18点', '19-20点', '21-22点', '23-24点'];
+				var data2 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+				if(list) {
+					data1 = [];
+					data2 = [];
+					for (var i in list) {
+						data1.push(i)
+						data2.push(list[i])
+					}
 				}
 
 				var headitemby = ""
@@ -1000,45 +969,47 @@
 	}
 
 	//各时段用电量
-	// .electricity-chart {
-	// 	margin: 24rpx 32rpx;
-	// 	padding: 40rpx 0rpx;
-	// 	background-color: #fff;
-	// 	border-radius: 8px;
-
-	// 	.title {
-	// 		display: flex;
-	// 		align-items: center;
-	// 		padding: 0 32rpx;
-	// 		margin-bottom: 40rpx;
-	// 		font-weight: bold;
-
-	// 		.icon {
-	// 			width: 36rpx;
-	// 			height: 36rpx;
-	// 			background-color: rgba(22, 119, 255, 1);
-	// 			border: 6px solid rgba(182, 212, 255, 1);
-	// 			border-radius: 100px;
-	// 		}
-
-	// 		.text {
-	// 			color: rgba(51, 51, 51, 1);
-	// 			font-size: 36rpx;
-	// 			margin-left: 16rpx;
-	// 		}
-	// 	}
-
-	// 	.chart {
-	// 		width: 100%;
-	// 		height: 440rpx;
-
-	// 		.img {
-	// 			width: 100%;
-	// 			height: 440rpx;
-	// 		}
-	// 	}
-	// }
-	.electricity-chart,
+	.electricity-chart {
+		margin: 24rpx 32rpx;
+		padding: 40rpx 0rpx;
+		background-color: #fff;
+		border-radius: 8px;
+	
+		.title {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 0 12rpx;
+			margin-bottom: 40rpx;
+	
+			.icon {
+				width: 36rpx;
+				height: 36rpx;
+				background-color: rgba(22, 119, 255, 1);
+				border: 6px solid rgba(182, 212, 255, 1);
+				border-radius: 100px;
+			}
+	
+			.text {
+				display: flex;
+				align-items: center;
+				color: rgba(51, 51, 51, 1);
+				font-size: 36rpx;
+				margin-left: 16rpx;
+			}
+		}
+	
+		.chart {
+			width: 100%;
+			height: 440rpx;
+	
+			.img {
+				width: 100%;
+				height: 440rpx;
+			}
+		}
+	}
+	
 	.equipment-information {
 		margin: 24rpx 32rpx;
 		padding: 40rpx 0rpx;

pages/equipmentDataMonitoring/equipmentElectricity.vue

@@ -36,10 +36,9 @@
 				</view>
 			</view>
 		</u-popup>
-		
-		<view class="total-main" >
+		<view class="tatol-main">
 			<!-- 用电量合计 -->
-			<view class="total" >
+			<view class="total">
 				<view class="company">
 					<view class="name">
 						荆鹏集团
@@ -76,7 +75,7 @@
 				</view>
 			</view>
 			
-			<view class="main" >
+			<view class="main">
 				<view class="item" v-for="(item, index) in kWhList" :key="index" @click="toElectronicMonitoring(item)">
 					<view class="icon">
 						<image class="img" src="@/assets/img/energyMeter.svg" mode=""></image>
@@ -100,18 +99,18 @@
 						</view>
 						<view class="electricity-item">
 							<view class="number">
-								{{item.thisMonthKwh}}
+								{{item.thisDayKwh}}
 							</view>
 							<view class="date">
-								本月
+								今日
 							</view>
 						</view>
 						<view class="electricity-item">
 							<view class="number">
-								{{item.lastMonthKwh}}
+								{{item.thisMonthKwh}}
 							</view>
 							<view class="date">
-								上月
+								本月
 							</view>
 						</view>
 					</view>
@@ -121,6 +120,7 @@
 		
 		
 		
+		
 	</view>
 </template>
 
@@ -151,10 +151,9 @@
 				current: 0
 			}
 		},
-		onReady() {
+		onLoad() {
 			this.getList();
 			this.getCompanyInfoList();
-			
 		},
 		onReachBottom() {
 			if (this.deviceList.length < this.recordsTotal) {
@@ -219,7 +218,6 @@
 						icon: "none"
 					})
 				})
-				
 			},
 			change(index) {
 				this.current = index;
@@ -229,7 +227,7 @@
 			},
 			toElectronicMonitoring(item) {
 				uni.navigateTo({
-					url: '/pages/equipmentDataMonitoring/electronicMonitoring?id=' + item.id
+					url: '/pages/equipmentDataMonitoring/electronicMonitoring?id=' + item.id + '&name=' + item.name
 				})
 			}
 		}
@@ -375,4 +373,4 @@
 		   }
 	   }
    }
-</style>
+</style>

pages/mine/contactService.vue

@@ -1,33 +1,40 @@
 <template>
-	<view>
-		<u-navbar title="联系客服"  title-color="#101010" ></u-navbar>
-		<view class="background">
-			<view class="common-problem">
-				<view class="headline">
-					常见问题
-				</view>
-				<!-- 标签 -->
-				<view class="tabs">
-					<u-tabs :list="list"  font-size="28" :is-scroll="false" :current="current" @change="change"></u-tabs>
-				</view>
-				<!-- 问题 -->
-				<view class="problems">
-					<u-collapse accordion="false">
-							<u-collapse-item :title="item.head" v-for="(item, index) in itemList" :open="item.open" :key="index">
-								{{item.body}}
-							</u-collapse-item>
-						</u-collapse>
-				</view>
-			</view>
+	<view>
+		<u-navbar title="联系客服" title-color="#101010"></u-navbar>
+		<u-divider :isnone="queryList.length==0"   nonetext="没有找到相关内容"
+			border-color="#CFD2D5">已经到底了</u-divider>
+		<view class="background" v-if="false">
+			<view class="common-problem">
+				<view class="headline">
+					常见问题
+				</view>
+				<!-- 标签 -->
+				<view class="tabs">
+					<u-tabs :list="list" font-size="28" :is-scroll="false" :current="current" @change="change"></u-tabs>
+				</view>
+				<!-- 问题 -->
+				<view class="problems">
+					<u-collapse accordion="false">
+						<u-collapse-item :title="item.head" v-for="(item, index) in itemList" :open="item.open" :key="index">
+							{{item.body}}
+						</u-collapse-item>
+					</u-collapse>
+				</view>
+			</view>
 		</view>
-		<!-- 底部 -->
-		<view class="bottom">
-			<button class="service">
-				<view>
-					<image class="img" src="@/assets/img/riFill-customer-service-2-fill 1.svg" mode=""></image>
-				</view>
-				客服电话（7:00-24:00）
-			</button>
+		
+		<u-modal v-model="openModalBl" @confirm="confirmPhone" confirm-text="拨打电话" confirm-color="#606266"
+			:show-cancel-button="true" ref="uModal" :asyncClose="true" title="客服电话" :content="content"
+			:content-style="{fontSize: '24px',color: '#101010'}"></u-modal>
+		
+		<!-- 底部 -->
+		<view class="bottom">
+			<button class="service" @click="openModalBl=true">
+				<view>
+					<image class="img" src="@/assets/img/riFill-customer-service-2-fill 1.svg" mode=""></image>
+				</view>
+				客服电话（7:00-24:00）
+			</button>
 		</view>
 	</view>
 </template>
@@ -36,32 +43,41 @@
 	export default {
 		data() {
 			return {
+				content: "400-8899-619",
+				queryList: [],
+				openModalBl: false,
 				list: [{
 					name: '软件使用'
 				}, {
 					name: '设备状态及参数'
 				}, {
 					name: '工单相关',
-					
-				}],
-				itemList: [{
-									head: "常见问题1",
-									body: "只要我们正确择取一个合适的参照物乃至稍降一格去看待他人，值得赏识的东西便会扑面而来",
-									open: true,
-									
-								},{
-									head: "常见问题2",
-									body: "学会欣赏，实际是一种积极生活的态度，是生活的调味品，会在欣赏中发现生活的美",
-									open: false,
-								},{
-									head: "常见问题3",
-									body: "但是据说雕刻大卫像所用的这块大理石，曾被多位雕刻家批评得一无是处，有些人认为这块大理石采凿得不好，有些人嫌它的纹路不够美",
-									open: false,
-								}],
+
+				}],
+				itemList: [{
+					head: "常见问题1",
+					body: "只要我们正确择取一个合适的参照物乃至稍降一格去看待他人，值得赏识的东西便会扑面而来",
+					open: true,
+
+				}, {
+					head: "常见问题2",
+					body: "学会欣赏，实际是一种积极生活的态度，是生活的调味品，会在欣赏中发现生活的美",
+					open: false,
+				}, {
+					head: "常见问题3",
+					body: "但是据说雕刻大卫像所用的这块大理石，曾被多位雕刻家批评得一无是处，有些人认为这块大理石采凿得不好，有些人嫌它的纹路不够美",
+					open: false,
+				}],
 				current: 0
 			}
 		},
 		methods: {
+			confirmPhone() {
+				this.openModalBl = false;
+				uni.makePhoneCall({
+					phoneNumber: this.content //仅为示例
+				});
+			},
 			change(index) {
 				this.current = index;
 			}
@@ -69,55 +85,69 @@
 	}
 </script>
 
-<style lang="scss" scoped>
-	.background{
-		position: relative;
-		height: 200px;
-		background: linear-gradient(180deg, rgba(203,234,255,1) 0%,rgba(203,234,255,0) 100%);
-		.common-problem{
-			position: absolute;
			top: 24rpx;
			left: 32rpx;
			right: 32rpx;
			background-color: #fff;
			border-radius: 8px;
			padding: 40rpx 32rpx;
			.headline{
-				color: rgba(16,16,16,1);
-				font-size: 36rpx;
-			}
-			// 标签
-			.tabs{
-				border-top: 1px solid rgba(232,232,232,1);
-				margin-top: 28rpx;
-				width: 522rpx;
-				/deep/.u-tab-item{
-					
-					font-size: 24rpx !important;
-				}
-			}
-			.problems{
-				margin-top: 8rpx;
-			}
-		}
+<style lang="scss" scoped>
+	.background {
+		position: relative;
+		height: 200px;
+		background: linear-gradient(180deg, rgba(203, 234, 255, 1) 0%, rgba(203, 234, 255, 0) 100%);
+
+		.common-problem {
+			position: absolute;
+			top: 24rpx;
+			left: 32rpx;
+			right: 32rpx;
+			background-color: #fff;
+			border-radius: 8px;
+			padding: 40rpx 32rpx;
+
+			.headline {
+				color: rgba(16, 16, 16, 1);
+				font-size: 36rpx;
+			}
+
+			// 标签
+			.tabs {
+				border-top: 1px solid rgba(232, 232, 232, 1);
+				margin-top: 28rpx;
+				width: 522rpx;
+
+				/deep/.u-tab-item {
+
+					font-size: 24rpx !important;
+				}
+			}
+
+			.problems {
+				margin-top: 8rpx;
+			}
+		}
+	}
+
+	// 底部
+	.bottom {
+		background-color: #fff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: 24rpx 32rpx;
+
+		.service {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			color: rgba(255, 255, 255, 1);
+			font-size: 32rpx;
+			border-radius: 50px;
+			background: linear-gradient(-88.46deg, rgba(34, 109, 198, 1) 2.59%, rgba(9, 158, 237, 1) 97.02%);
+		}
+
+		.img {
+			width: 40rpx;
+			height: 40rpx;
+			vertical-align: middle;
+			margin-right: 16rpx;
+		}
 	}
-  // 底部
-  .bottom{
-	  background-color: #fff;
-	  position: fixed;
-	  bottom: 0;
-	  left: 0;
-	  right: 0;
-	  padding: 24rpx 32rpx;
-	  
-	  .service{
-		  display: flex;
-		  justify-content: center;
-		  align-items: center;	
-		  
-		  color: rgba(255,255,255,1);
-		  font-size: 32rpx;
-		  border-radius: 50px;
-		  background: linear-gradient(-88.46deg, rgba(34,109,198,1) 2.59%,rgba(9,158,237,1) 97.02%);
-	  }
-	  .img{
-		  width: 40rpx;
-		  height: 40rpx;
-		  vertical-align: middle;
-		  margin-right: 16rpx;
-	  }
-  }
-</style>
+</style>

pages/mine/message.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="navbar-c">
-			<view class="back">
+			<view class="back" @click="backMine">
 				<u-icon name="arrow-left" color="#101010" size="36"></u-icon>
 			</view>
 			<view class="title">
@@ -12,27 +12,27 @@
 			</view>
 
 		</view>
-	
-	<view class="message-item" v-for="item in 2">
-		<view class="item-icon">
-			<image class="img" src="@/assets/img/riFill-clipboard-fill.svg" mode=""></image>
-		</view>
-		<view class="message-infos">
-			<view class="infos-top">
-				<view class="title">
-					工单提醒
+
+		<view class="message-item" v-for="item in 2">
+			<view class="item-icon">
+				<image class="img" src="@/assets/img/riFill-clipboard-fill.svg" mode=""></image>
+			</view>
+			<view class="message-infos">
+				<view class="infos-top">
+					<view class="title">
+						工单提醒
+					</view>
+					<view class="date">
+						01-02 12:00
+					</view>
 				</view>
-				<view class="date">
-					01-02 12:00
+				<view class="details">
+					[编号No123456]荆鹏软件园01设备温度异常，请尽快处理，处理人郭群...
 				</view>
 			</view>
-			<view class="details">
-				[编号No123456]荆鹏软件园01设备温度异常，请尽快处理，处理人郭群...
-			</view>
 		</view>
-	</view>
-	
-	
+
+
 	</view>
 </template>
 
@@ -44,57 +44,67 @@
 			}
 		},
 		methods: {
-
+			backMine() {
+				uni.navigateBack()
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-.message-item{
-	border-radius: 8px;
-	background-color: rgba(255,255,255,1);
-	margin: 20rpx 32rpx;
-	padding: 24rpx 32rpx;
-	display: flex;
-	align-items: center;	
-	.item-icon{
+	.back {
+		z-index: 999;
+		width: 200rpx;
+	}
+	
+	.message-item {
+		border-radius: 8px;
+		background-color: rgba(255, 255, 255, 1);
+		margin: 20rpx 32rpx;
+		padding: 24rpx 32rpx;
 		display: flex;
 		align-items: center;
-		justify-content: center;
-		width: 96rpx;
-		height: 96rpx;
-		border-radius: 12px;
-		background: linear-gradient(180.29deg, rgba(255,214,125,1) 0.9%,rgba(255,150,0,1) 100.4%);
-		.img{
-			width: 56rpx;
-			height: 56rpx;
-		}
-	}
-	.message-infos{
-		flex: 1;
-		margin-left: 24rpx;
-		.infos-top{
+
+		.item-icon {
 			display: flex;
 			align-items: center;
-			justify-content: space-between;
-			.title{
-				color: rgba(16,16,16,1);
-				font-size: 32rpx;
-			}
-			.date{
-				color: rgb(140,140,140);
-				font-size: 24rpx;
+			justify-content: center;
+			width: 96rpx;
+			height: 96rpx;
+			border-radius: 12px;
+			background: linear-gradient(180.29deg, rgba(255, 214, 125, 1) 0.9%, rgba(255, 150, 0, 1) 100.4%);
+
+			.img {
+				width: 56rpx;
+				height: 56rpx;
 			}
 		}
-		.details{
-			color: rgba(119,119,119,1);
-			font-size: 24rpx;
-			margin-top: 16rpx;
-		}
-	}
-}
 
+		.message-infos {
+			flex: 1;
+			margin-left: 24rpx;
+
+			.infos-top {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
 
+				.title {
+					color: rgba(16, 16, 16, 1);
+					font-size: 32rpx;
+				}
 
+				.date {
+					color: rgb(140, 140, 140);
+					font-size: 24rpx;
+				}
+			}
 
+			.details {
+				color: rgba(119, 119, 119, 1);
+				font-size: 24rpx;
+				margin-top: 16rpx;
+			}
+		}
+	}
 </style>

pages/mine/mine.vue

@@ -2,7 +2,8 @@
 	<view>
 		<view class="background">
 			<!-- 个人信息 -->
-			<view class="person-infos" @click="toPersonInfos">
+			<!-- <view class="person-infos" @click="gotoUrl('/pages/mine/personInfos')"> -->
+			<view class="person-infos">
 				<view class="photo">
 					<!-- <u-avatar class="avatar"
 						src="@/assets/img/photo@x1.png" size="112">
@@ -11,7 +12,7 @@
 				</view>
 				<view class="else">
 					<view class="name">
-						{{info.name}}
+						{{personInfo.name}}
 					</view>
 					<view class="company">
 						运维专员
@@ -23,11 +24,11 @@
 			<view class="address-box">
 				<view class="address">
 					<view class="address-title">
-						{{companyInfo.fullName}}
+						湖北荆鹏软件集团
 					</view>
-					<!-- <view class="address-value">
+					<view class="address-value">
 						<u-icon name="map"></u-icon>荆州市沙市区江津东路附155号
-					</view> -->
+					</view>
 				</view>
 
 				<view class="image">
@@ -37,7 +38,7 @@
 		</view>
 		<!-- 功能 -->
 		<view class="function-group">
-			<view class="function-item">
+			<view class="function-item" @click="gotoUrl('/pages/mine/filialeList')" v-if="false">
 				<view class="icon">
 					<image class="img" src="@/assets/img/riLine-function-line.svg" mode=""></image>
 				</view>
@@ -48,7 +49,7 @@
 					<u-icon name="arrow-right" color="#b2b2b2"></u-icon>
 				</view>
 			</view>
-<view class="function-item">
+			<view class="function-item" @click="gotoUrl('/pages/mine/message')" v-if="false">
 				<view class="icon">
 					<image class="img" src="@/assets/img/riLine-message-2-line.svg" mode=""></image>
 				</view>
@@ -62,7 +63,7 @@
 
 
 
-			<view class="function-item">
+			<view class="function-item" @click="gotoUrl('/pages/mine/feedbackRecord')" v-if="false">
 				<view class="icon">
 					<image class="img" src="@/assets/img/riLine-feedback-line.svg" mode=""></image>
 				</view>
@@ -74,7 +75,7 @@
 				</view>
 			</view>
 
-			<view class="function-item">
+			<view class="function-item" @click="gotoUrl('/pages/mine/contactService')">
 				<view class="icon">
 					<image class="img" src="@/assets/img/riLine-customer-service-2-line.svg" mode=""></image>
 				</view>
@@ -91,7 +92,7 @@
 
 
 		<view class="function-group">
-			<view class="function-item" @click="toSetting">
+			<view class="function-item" @click="gotoUrl('/pages/mine/setting')">
 				<view class="icon">
 					<image class="img" src="@/assets/img/riLine-settings-2-line.svg" mode=""></image>
 				</view>
@@ -110,54 +111,31 @@
 </template>
 
 <script>
-	import  energyCenterTabbar from '@/components/energyCenterTabbar.vue'
+	import energyCenterTabbar from '@/components/energyCenterTabbar.vue'
 	import * as API from '@/apis/pagejs/energy/index.js'
-	
+
 	export default {
 		components: {
 			energyCenterTabbar
 		},
 		data() {
 			return {
-				info: {},
+				personInfo: {},
 				companyInfo: {}
 			}
 		},
 		onLoad() {
-			
+
 		},
-		onReady() {
-			this.getfindByOpenId();
+		onShow() {
+			if(this.carhelp.getPersonInfoPlus()) {
+				var data = this.carhelp.getPersonInfoPlus();
+				this.personInfo = data.regUser;
+				this.companyInfo = data.companyInfo;
+			}
 		},
 		methods: {
-			getfindByOpenId() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.findByOpenId({
-					openId: this.carhelp.getOpenId()
-				}).then((response) => {
-					uni.hideLoading();
-					this.info = response.data.regUser;
-					this.companyInfo = response.data.companyInfo;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			toSetting() {
-				uni.navigateTo({
-					url: '/pages/mine/setting'
-				})
-			},
-			toPersonInfos() {
-				uni.navigateTo({
-					url: '/pages/mine/personInfos'
-				})
-			}
+			
 		}
 	}
 </script>

pages/mine/personInfos.vue

@@ -1,19 +1,19 @@
 <template>
 	<view>
-		<u-navbar title="个人信息"  title-color="#101010" ></u-navbar>
+		<u-navbar title="个人信息" title-color="#101010"></u-navbar>
 		<view class="infos-group">
 			<view class="infos-item">
 				<view class="item-title">
 					头像
 				</view>
 				<view class="item-value value-img">
-					<image class="img" src="@/assets/img/photo@x1.png" mode=""></image>
-				    <u-icon color="#b2b2b2" name="arrow-right"></u-icon>
+					<image class="img" src="@/assets/img/默认头像.png" mode=""></image>
+					<u-icon color="#b2b2b2" name="arrow-right"></u-icon>
 				</view>
 			</view>
-			
+
 		</view>
-		
+
 		<view class="infos-group">
 			<view class="infos-item">
 				<view class="item-title">
@@ -21,7 +21,7 @@
 				</view>
 				<view class="item-value">
 					周琼
-				    <u-icon color="#b2b2b2" name="arrow-right"></u-icon>
+					<u-icon color="#b2b2b2" name="arrow-right"></u-icon>
 				</view>
 			</view>
 			<view class="infos-item">
@@ -30,7 +30,7 @@
 				</view>
 				<view class="item-value">
 					女
-				    <u-icon color="#b2b2b2" name="arrow-right"></u-icon>
+					<u-icon color="#b2b2b2" name="arrow-right"></u-icon>
 				</view>
 			</view>
 			<view class="infos-item">
@@ -47,79 +47,62 @@
 				</view>
 				<view class="item-value">
 					运维专员
-				    
+
 				</view>
 			</view>
-			
+
 		</view>
 	</view>
 </template>
 
 <script>
 	import * as API from '@/apis/pagejs/energy/index.js'
-	
+
 	export default {
 		data() {
 			return {
-				info: {},
+				personInfo: {},
 				companyInfo: {}
 			}
 		},
-		onReady() {
-			this.getfindByOpenId();
-		},
 		methods: {
-			getfindByOpenId() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.findByOpenId({
-					openId: this.carhelp.getOpenId()
-				}).then((response) => {
-					uni.hideLoading();
-					this.info = response.data.regUser;
-					this.companyInfo = response.data.companyInfo;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
+
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.infos-group{
+	.infos-group {
 		margin: 24rpx 32rpx;
 		background-color: #fff;
 		border-radius: 8px;
-		.infos-item{
+
+		.infos-item {
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
 			padding: 36rpx 32rpx;
-			.item-title{
-				color: rgba(51,51,51,1);
+
+			.item-title {
+				color: rgba(51, 51, 51, 1);
 				font-size: 32rpx;
 			}
-			.item-value{
-				
-				color:#777777;
-				
-				.img{
+
+			.item-value {
+
+				color: #777777;
+
+				.img {
 					width: 80rpx;
 					height: 80rpx;
 					border-radius: 50px;
 				}
 			}
-			.value-img{
+
+			.value-img {
 				display: flex;
 				align-items: center;
 			}
 		}
 	}
-
-</style>
+</style>

pages/mine/setting.vue

@@ -1,37 +1,46 @@
 <template>
 	<view>
-		<u-navbar title="设置"  title-color="#101010" ></u-navbar>
+		<u-navbar title="设置" title-color="#101010"></u-navbar>
 		<u-cell-group>
-				<u-cell-item  title="个人信息" @click="gotoUrl('/pages/mine/personInfos')" ></u-cell-item>
-				<u-cell-item  title="修改密码"  @click="gotoUrl('/pages/mine/changePassword')"  ></u-cell-item>
-				<u-cell-item  title="修改手机号" :value="personInfo.phone"  @click="gotoUrl('/pages/mine/changePhone')" ></u-cell-item>
-				<u-cell-item  title="注销账号"   @click="gotoUrl('/pages/mine/cancelAccount')" ></u-cell-item>
-			</u-cell-group>
-			
-			<view class="exit" @click="signOut" >
-				退出账号
-			</view>
-			
-			<u-modal v-model="show1" @confirm="confirm" confirm-color="#FF3D00" :show-cancel-button="true" ref="uModal" :asyncClose="true" title="退出账号"
-				content="是否退出当前账号?" :content-style="{color: '#333333'}"></u-modal>
-				
+			<u-cell-item title="个人信息" @click="gotoUrl('/pages/mine/personInfos')"></u-cell-item>
+			<u-cell-item title="修改密码" @click="gotoUrl('/pages/mine/changePassword')"></u-cell-item>
+			<u-cell-item title="修改手机号" :value="personInfo.phone" @click="gotoUrl('/pages/mine/changePhone')"></u-cell-item>
+			<u-cell-item title="注销账号" @click="gotoUrl('/pages/mine/cancelAccount')"></u-cell-item>
+		</u-cell-group>
+
+		<view class="exit" @click="signOut">
+			退出账号
+		</view>
+
+		<u-modal v-model="show1" @confirm="confirm" confirm-color="#FF3D00" :show-cancel-button="true" ref="uModal"
+			:asyncClose="true" title="退出账号" content="是否退出当前账号?" :content-style="{color: '#333333'}"></u-modal>
+
 	</view>
-	
-	
+
+
 </template>
 
 <script>
 	import * as userApi from '@/apis/pagejs/user.js'
 	// import * as API from '@/apis/pagejs/index.js'
-	
+
 	export default {
 		data() {
 			return {
-					personInfo:{},
-					show1:false,
+				personInfo: {},
+				show1: false,
 			}
 		},
 		onLoad() {
+			if(this.carhelp.getPersonInfoPlus()) {
+				var data = this.carhelp.getPersonInfoPlus();
+				this.personInfo = data.regUser;
+				if(this.personInfo.phone != null) {
+					var phone = this.personInfo.phone;
+					phone = phone.slice(0,3) + '****' + phone.slice(-4);
+					this.personInfo.phone = phone;
+				}
+			}
 			//this.homePage()
 		},
 		methods: {
@@ -42,7 +51,7 @@
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
-				})		
+				})
 				userApi.logout().then((res) => {
 					uni.hideLoading();
 					this.show1 = false;
@@ -56,43 +65,28 @@
 						icon: "none"
 					})
 				})
-			},
-			homePage(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.homePage({
-					
-				}).then((response) => {
-					uni.hideLoading();
-					
-					this.personInfo=response.data.regUser;
-				}).catch(error => {
-					uni.hideLoading();
-					
-				})
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	/deep/.u-cell_title{
-		color: rgba(51,51,51,1);
+	/deep/.u-cell_title {
+		color: rgba(51, 51, 51, 1);
 	}
-	/deep/.u-cell__value{
+
+	/deep/.u-cell__value {
 		color: #777777;
-	};
-	
-	.exit{
+	}
+
+	;
+
+	.exit {
 		background-color: #fff;
-		margin: 24rpx 0 0 0 ;
+		margin: 24rpx 0 0 0;
 		text-align: center;
 		line-height: 96rpx;
-		color: rgba(238,49,56,1);
+		color: rgba(238, 49, 56, 1);
 		font-size: 32rpx;
 	}
-
-</style>
+</style>

pages/statistics/statistics.vue

@@ -106,10 +106,10 @@
 						@click="toElectronicMonitoring(item)">
 
 						<view class="equipment">
-							<view class="equipment1">
+							<view class="equipment1 equipment-text-overflow">
 								{{item.name}}
 							</view>
-							<view class="equipment2">
+							<view class="equipment2 equipment-text-overflow">
 								{{item.companyName}}
 							</view>
 						</view>
@@ -270,7 +270,7 @@
 		
 		</view>
 
-		<energyCenterTabbar :current="0" v-if="0"></energyCenterTabbar>
+		<energyCenterTabbar :current="0"></energyCenterTabbar>
 	</view>
 </template>
 
@@ -476,7 +476,7 @@
 			},
 			toElectronicMonitoring(item) {
 				uni.navigateTo({
-					url: '/pages/equipmentDataMonitoring/electronicMonitoring?id=' + item.id
+					url: '/pages/equipmentDataMonitoring/electronicMonitoring?id=' + item.id + '&name=' + item.name
 				})
 			}
 		}
@@ -638,6 +638,12 @@
 					.equipment {
 						width: 30%;
 						
+						.equipment-text-overflow {
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 1;
+							overflow: hidden;
+						}
 						.equipment1 {
 							color: rgba(51, 51, 51, 1);
 							font-size: 32rpx;