css

pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -16,77 +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">
-<<<<<<< HEAD
 					{{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>
-=======
-					{{title}}<u-icon v-if="false" name="arrow-down" color="#fff" size="24"
-						@click="equipmentShow=true"></u-icon>
->>>>>>> d6db741283ddecd108c9c7844ac40a43193c5dd9
 				</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">
@@ -171,8 +112,6 @@
 		<!-- 各时段用电量 -->
 		<view class="electricity-chart">
 			<view class="title">
-<<<<<<< HEAD
-
 				<view class="text">
 					<view class="icon">
 
@@ -180,16 +119,6 @@
 
 				</view>
 				<view @click="tabsFrom.show2=true,params.day=true">
-=======
-				<view class="icon">
-
-				</view>
-				<view class="text">
-					各时段用电量 (度)
-
-				</view>
-				<view class="date" @click="tabsFrom.show2=true,params.day=true">
->>>>>>> d6db741283ddecd108c9c7844ac40a43193c5dd9
 					{{queryDay}}<u-icon name="arrow-down"></u-icon>
 				</view>
 			</view>
@@ -198,6 +127,9 @@
 				<view id="barEcharts" style="min-height:440rpx;">
 
 				</view>
+				<view style="
+				text-align: center;
+					background: white;" ></view>
 			</view>
 		</view>
 		<!-- 异常波动 -->
@@ -465,10 +397,6 @@
 			return {
 				equipmentInfosShow:false,
 				kWhList: [],
-<<<<<<< HEAD
-=======
-				title: '',
->>>>>>> d6db741283ddecd108c9c7844ac40a43193c5dd9
 				queryDay: '',
 				showTop: [0, 0, 0, 0, 0, 0, 0, 0],
 				FormData: {
@@ -557,7 +485,6 @@
 					backgroundColor: '#1677FF',
 				},
 				list: [{
-<<<<<<< HEAD
 					id: 4,
 					name: '当日用电量',
 					disabled: false
@@ -583,36 +510,6 @@
 					disabled: false
 				}],
 				value: '2',
-=======
-						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',
->>>>>>> d6db741283ddecd108c9c7844ac40a43193c5dd9
 			};
 		},
 		onLoad(op) {
@@ -624,14 +521,8 @@
 			this.endYear = new Date().getFullYear();
 			this.FormData.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
 			this.FormData2.queryDate = parseUnixTime(new Date(), '{y}-{m}-{d}');
-<<<<<<< HEAD
 			this.FormData.type = 2;
 
-=======
-			this.FormData.type = 0;
-
-			this.getTimeSlotStatistics();
->>>>>>> d6db741283ddecd108c9c7844ac40a43193c5dd9
 			this.getElectricityStatistics();
 			this.getTimeSlotStatistics();
 			this.getList();
@@ -640,7 +531,6 @@
 			this.getBarCharts(false);
 		},
 		methods: {
-<<<<<<< HEAD
 			selector1confirm(e) {
 
 				var index = e[0];
@@ -659,8 +549,6 @@
 				this.getTimeSlotStatistics();
 				this.getElectricityStatistics();
 			},
-=======
->>>>>>> d6db741283ddecd108c9c7844ac40a43193c5dd9
 			queryDate(queryTime, day) {
 
 				if (day) {
@@ -668,31 +556,15 @@
 					//this.FormData2.type =day?"9":"10"
 					//this.value="-1"
 
-<<<<<<< HEAD
 					this.getTimeSlotStatistics();
-=======
-					this.getTimeSlotStatistics()
->>>>>>> d6db741283ddecd108c9c7844ac40a43193c5dd9
-
 				} else {
 
 					this.FormData.queryDate = queryTime + "-01";
-<<<<<<< HEAD
 					this.FormData.type = "10";
 					//this.value="-1"
 
 					this.getElectricityStatistics();
 				}
-=======
-					this.FormData.type = "10"
-					//this.value="-1"
-
-					this.getElectricityStatistics()
-
-				}
-
-
->>>>>>> d6db741283ddecd108c9c7844ac40a43193c5dd9
 			},
 			getList() {
 				uni.showLoading({
@@ -706,17 +578,11 @@
 				API.homePageKwh(data).then((res) => {
 					uni.hideLoading()
 					this.kWhList = res.data.data;
-<<<<<<< HEAD
 					this.tabsFrom.selector1 = [];
 					this.tabsFrom.selector1 = this.kWhList.map(item => {
 						return {
 							label: item.name,
 							value: item.id
-=======
-					for (var i = 0; i < this.kWhList.length; i++) {
-						if (this.kWhList[i].id == this.FormData.meterId) {
-							this.title = this.kWhList[i].name;
->>>>>>> d6db741283ddecd108c9c7844ac40a43193c5dd9
 						}
 					})
 				}).catch(error => {
@@ -793,7 +659,7 @@
 					});
 				}
 				this.myChart.clear();
-<<<<<<< HEAD
+
 				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];
@@ -804,13 +670,6 @@
 						data1.push(i)
 						data2.push(list[i])
 					}
-=======
-				var data1 = [];
-				var data2 = [];
-				for (var i in list) {
-					data1.push(i)
-					data2.push(list[i])
->>>>>>> d6db741283ddecd108c9c7844ac40a43193c5dd9
 				}
 
 				var headitemby = ""
@@ -843,10 +702,7 @@
 					},
 					yAxis: {
 						type: 'value',
-<<<<<<< HEAD
-=======
 
->>>>>>> d6db741283ddecd108c9c7844ac40a43193c5dd9
 					},
 					series: [{
 						name: '合计',
@@ -1113,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/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>
@@ -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;