From 4b8a2e13bbc31cb9bcf3965de58d551257669ca9 Mon Sep 17 00:00:00 2001
From: huyuanxiang <273637057@qq.com>
Date: Thu, 2 Mar 2023 16:53:04 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E6=B7=BB=E5=8A=A0=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E5=8A=9F=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/station/item1.vue |  8 +++++---
 pages/station/item2.vue | 11 +++++++++++
 pages/station/list.vue  |  5 ++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/pages/station/item1.vue b/pages/station/item1.vue
index 1f2b36b..61757d4 100644
--- a/pages/station/item1.vue
+++ b/pages/station/item1.vue
@@ -86,7 +86,9 @@
 								           		
 								           			<div class="item flex" :class="itemStateClass(item.state).clas"  v-for="item in secondList" :key="item.id">
 								           				<div class="item-img">
-								           					<div class="img-list flex flex-wrap base-item">
+								           					<div class="img-list flex flex-wrap base-item" 
+															:class="item.list.length > 8 ? '' : 'eight-item'"
+															>
 								           						<div  :class="['img-it'
 														  ,  itemClass(it.electricQuantity)
 														  ]" v-for="(it,ind) in item.list" :key="ind">
@@ -610,7 +612,7 @@
 		            .item {
 		              //width: 100%;
 		              //height: 100%;
-					    &.z1 {
+							&.z1 {
 							  color: #00d40e;
 							}
 							&.z2 {
@@ -630,7 +632,7 @@
 						  padding: 2upx;
 		                  justify-content: space-around;
 		                  &.eight-item {
-		                    width: 184upx;
+		                    width: 300upx;
 		                  }
 		                  .img-it {
 		                    width: 70upx;
diff --git a/pages/station/item2.vue b/pages/station/item2.vue
index 29e8bde..46cc87d 100644
--- a/pages/station/item2.vue
+++ b/pages/station/item2.vue
@@ -66,6 +66,7 @@
 			</view>
 			<view class="content">
 				<view class='timer' @click="show = true">时间：{{ timer }}</view>
+				<view class="limit-timer" :class="infoData.powerLimitTime ? 'limit' : ''">{{ !infoData.powerLimitTime ?　'未限制功率'　:　`限制功率： ${infoData.powerLimit.p}%` }}</view>
 				<echarts ref="echarts" class="uni-ec-canvas" :option="option" canvasId="echarts"></echarts>
 				<div class="report-item-bottom flex flex-column" v-show="type === 'first'">
 					<table border="2" :class="itemStateClass(infoData.state).clas">
@@ -451,6 +452,7 @@
 						}
 					})
 					_data._name = _data.equipmentName.split(' ')[1]
+					_data.powerLimit = JSON.parse( _data.powerLimit)
 					this.infoData = Object.assign({_itemList }, _data)
 				})
 			},
@@ -671,10 +673,19 @@
 	
 }
 .content {
+	position: relative;
 	padding: 20upx;
 	.timer {
 		margin-bottom: 20upx;
 	}
+	.limit-timer {
+		position: absolute;
+		right: 20upx;
+		top: 20upx;
+		&.limit {
+			color: #fc6;
+		}
+	}
 	background: #000;
 	color: #f5f5f5;
 }
diff --git a/pages/station/list.vue b/pages/station/list.vue
index 2139551..7c2277d 100644
--- a/pages/station/list.vue
+++ b/pages/station/list.vue
@@ -269,6 +269,9 @@
 	// max-height: 90vh;
 	// overflow-y: scroll;
 }
+/deep/ .uni-card {
+	padding: 0 !important;
+}
 .station-info {
 	// margin-top: 20px;
 	display: flex;
@@ -297,7 +300,7 @@
 		}
 		.right {
 			color: #4aaf0b;
-			letter-spacing: 2upx;
+			// letter-spacing: 2upx;
 		}
 		
 	}